Merge branch 'feature-NXCALS-7578-lower-timeout-on-hbase-calls' into 'develop'

NXCALS-7578 lower timout limit

Closes NXCALS-7578

See merge request !1947

ansible/group_vars/all/all.yml

@@ -344,6 +344,9 @@ service_kerberos_type: 'HTTPS'
 nxcals_security_rbac_role_prefix: "{{nxcals_namespace | replace('_', '-') | upper}}-"
 service_rbac_login_policy: "LOCATION"
 
+service_hbase_rpc_timeout: 60000
+service_hbase_client_operation_timeout: 1200000
+
 #NXCALS - Monitoring-grok
 #################################################################################
 monitoring_grok_memory: "-Xms64m -Xmx128m"

ansible/roles/service/templates/config/application.properties

@@ -54,6 +54,8 @@ data.location.hbase-namespace={{hbase_namespace}}
 data.location.date-granularity = DAYS
 data.location.date-grouping-type={{date_grouping_type}}
 data.location.adaptive-extraction-enabled={{service_extraction_adaptive_enabled}}
+data.location.hbase.rpc.timeout={{service_hbase_rpc_timeout}}
+data.location.hbase.client.operation.timeout={{service_hbase_client_operation_timeout}}
 service.kerberos.keytab={{service_kerberos_keytab}}
 service.kerberos.realm={{service_kerberos_realm}}
 service.kerberos.type={{service_kerberos_type}}

service/src/main/java/cern/nxcals/service/config/DataAccessConfig.java

@@ -66,6 +66,10 @@ public class DataAccessConfig {
     @Bean
     @DependsOn("kerberos")
     public Connection hbaseConnection() throws IOException {
-        return ConnectionFactory.createConnection(HBaseConfiguration.create());
+        org.apache.hadoop.conf.Configuration config = HBaseConfiguration.create();
+        config.setInt("hbase.rpc.timeout", properties.getHbaseRpcTimeout());
+        config.setInt("hbase.client.operation.timeout", properties.getHbaseClientOperationTimeout());
+
+        return ConnectionFactory.createConnection(HBaseConfiguration.create(config));
     }
 }
\ No newline at end of file

service/src/main/java/cern/nxcals/service/config/DataLocationProperties.java

@@ -19,4 +19,6 @@ public class DataLocationProperties {
     private ChronoUnit dateGranularity = ChronoUnit.DAYS;
     private DateGroupingType dateGroupingType = DateGroupingType.DAYS;
     private boolean adaptiveExtractionEnabled = false;
+    private int hbaseRpcTimeout = 60000;
+    private int hbaseClientOperationTimeout = 1200000;
 }