GEOMESA-3310 HBase - Expose additional HBase configurations as system…

… properties. Expose - geomesa.hbase.coprocessor.threads - geomesa.hbase.ranges.max-per-extended-scan - geomesa.hbase.ranges.max-per-coprocessor-scan Signed-off-by: Austin Heyne <[email protected]>
locationtech · Nov 10, 2023 · 57205bf · 57205bf
1 parent 41be655
commit 57205bf
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/docs/user/hbase/configuration.rst b/docs/user/hbase/configuration.rst
@@ -117,3 +117,18 @@ geomesa.hbase.query.block.caching.enabled
 
 Set whether blocks should be cached for scans, true by default. When true, default settings of the table and
 family are used (this will never override caching blocks if the block cache is disabled for that family or entirely).
+
+geomesa.hbase.coprocessor.threads
++++++++++++++++++++++++++++++++++
+
+The number of HBase RPC threads to use per coprocessor query
+
+geomesa.hbase.ranges.max-per-extended-scan
+++++++++++++++++++++++++++++++++++++++++++
+
+Max ranges per extended scan. Ranges will be grouped into scans based on this setting.
+
+geomesa.hbase.ranges.max-per-coprocessor-scan
++++++++++++++++++++++++++++++++++++++++++++++
+
+Max ranges per coprocessor scan. Ranges will be grouped into scans based on this setting
diff --git a/...e-datastore/src/main/scala/org/locationtech/geomesa/hbase/data/HBaseDataStoreParams.scala b/...e-datastore/src/main/scala/org/locationtech/geomesa/hbase/data/HBaseDataStoreParams.scala
@@ -14,7 +14,7 @@ import org.locationtech.geomesa.hbase.HBaseSystemProperties
 import org.locationtech.geomesa.index.geotools.GeoMesaDataStoreFactory.GeoMesaDataStoreParams
 import org.locationtech.geomesa.security.SecurityParams
 import org.locationtech.geomesa.utils.geotools.GeoMesaParam
-import org.locationtech.geomesa.utils.geotools.GeoMesaParam.{ReadWriteFlag, SystemPropertyBooleanParam}
+import org.locationtech.geomesa.utils.geotools.GeoMesaParam.{ReadWriteFlag, SystemPropertyBooleanParam, SystemPropertyIntegerParam}
 
 object HBaseDataStoreParams extends GeoMesaDataStoreParams with SecurityParams {
 
@@ -57,6 +57,7 @@ object HBaseDataStoreParams extends GeoMesaDataStoreParams with SecurityParams {
       "The number of HBase RPC threads to use per coprocessor query",
       default = Int.box(16),
       supportsNiFiExpressions = true,
+      systemProperty = Some(SystemPropertyIntegerParam(HBaseSystemProperties.CoprocessorThreadsProperty)),
       readWrite = ReadWriteFlag.ReadOnly
     )
 
@@ -84,6 +85,7 @@ object HBaseDataStoreParams extends GeoMesaDataStoreParams with SecurityParams {
       default = 100,
       deprecatedKeys = Seq("max.ranges.per.extended.scan"),
       supportsNiFiExpressions = true,
+      systemProperty = Some(SystemPropertyIntegerParam(HBaseSystemProperties.MaxRangesPerExtendedScanProperty)),
       readWrite = ReadWriteFlag.ReadUpdate
     )
 
@@ -93,6 +95,7 @@ object HBaseDataStoreParams extends GeoMesaDataStoreParams with SecurityParams {
       "Max ranges per coprocessor scan. Ranges will be grouped into scans based on this setting",
       default = Int.MaxValue,
       supportsNiFiExpressions = true,
+      systemProperty = Some(SystemPropertyIntegerParam(HBaseSystemProperties.MaxRangesPerCoprocessorScanProperty)),
       readWrite = ReadWriteFlag.ReadOnly
     )
 

diff --git a/...hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/package.scala b/...hbase/geomesa-hbase-datastore/src/main/scala/org/locationtech/geomesa/hbase/package.scala
@@ -30,6 +30,9 @@ package object hbase {
     val RemoteDensityProperty      : SystemProperty = SystemProperty("geomesa.hbase.coprocessor.density.enable")
     val RemoteStatsProperty        : SystemProperty = SystemProperty("geomesa.hbase.coprocessor.stats.enable")
     val YieldPartialResultsProperty: SystemProperty = SystemProperty("geomesa.hbase.coprocessor.yield.partial.results")
+    val CoprocessorThreadsProperty : SystemProperty = SystemProperty("geomesa.hbase.coprocessor.threads", "16")
+    val MaxRangesPerExtendedScanProperty   : SystemProperty = SystemProperty("geomesa.hbase.ranges.max-per-extended-scan", "100")
+    val MaxRangesPerCoprocessorScanProperty: SystemProperty = SystemProperty("geomesa.hbase.ranges.max-per-coprocessor-scan", Int.MaxValue.toString)
 
     @deprecated("Use coprocessor url")
     val CoprocessorPath: SystemProperty = SystemProperty("geomesa.hbase.coprocessor.path")