From d00c8cd789285a0453b8e19d30b902a9e8fb5990 Mon Sep 17 00:00:00 2001
From: Piotr Sowinski <piotr.sowinski@cern.ch>
Date: Thu, 21 Mar 2024 11:10:15 +0100
Subject: [PATCH] NXCALS-7578 operation timeout property added
---
ansible/roles/service/templates/config/application.properties | 3 ++-
.../java/cern/nxcals/service/config/DataAccessConfig.java | 4 ++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/ansible/roles/service/templates/config/application.properties b/ansible/roles/service/templates/config/application.properties
index 12c6f2e5b7..000d81756f 100644
--- a/ansible/roles/service/templates/config/application.properties
+++ b/ansible/roles/service/templates/config/application.properties
@@ -91,5 +91,6 @@ nxcals.security.rbac.role.prefix={{nxcals_security_rbac_role_prefix}}
service.rbac.login.policy={{service_rbac_login_policy}}
service.rbac.login.username={{nxcals_run_user}}
service.rbac.login.password={{vault_acclog_password}}
-hbase.rpc.timeout=30000
+hbase.rpc.timeout=20000
+hbase.client.operation.timeout=400000
diff --git a/service/src/main/java/cern/nxcals/service/config/DataAccessConfig.java b/service/src/main/java/cern/nxcals/service/config/DataAccessConfig.java
index 3ea7ebb2bb..f0f25dd2d7 100644
--- a/service/src/main/java/cern/nxcals/service/config/DataAccessConfig.java
+++ b/service/src/main/java/cern/nxcals/service/config/DataAccessConfig.java
@@ -29,6 +29,9 @@ public class DataAccessConfig {
@Value("${hbase.rpc.timeout:60000}")
private int rpcTimeout;
+ @Value("${hbase.client.operation.timeout:1200000}")
+ private int clientOperationTimeout;
+
@Bean
@Profile("!single-table")
@Qualifier("hbaseTableProvider")
@@ -72,6 +75,7 @@ public class DataAccessConfig {
public Connection hbaseConnection() throws IOException {
org.apache.hadoop.conf.Configuration config = HBaseConfiguration.create();
config.setInt("hbase.rpc.timeout", rpcTimeout);
+ config.setInt("hbase.client.operation.timeout", clientOperationTimeout);
return ConnectionFactory.createConnection(HBaseConfiguration.create(config));
}
--
GitLab