Unify prop files for builds and production (#1752)

Fixes #1732
deephaven · Jan 3, 2022 · 428d7d7 · 428d7d7
1 parent 4dc0ebf
commit 428d7d7
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 201 deletions.
diff --git a/configs/dh-defaults.prop b/configs/dh-defaults.prop
@@ -1,40 +1,10 @@
-########################################################################################################################
-# Default properties for Deephaven installations
-########################################################################################################################
-
-# Used to describe the system. Used in the UI to differentiate between multiple instances
-# system.name: Any valid string
-# system.type: PROD (production), QA (Quality Assurance), DEV (development), SIM (simulator), or any string.
-system.name=Deephaven
-system.type=PROD
-# Optional param to set the color displayed on the System Information Bar and Badge
-# Any html support color can be set, but it is recommended to use Deephaven colors (e.g. var(--info))
-# Deephaven colors are: primary, primary-dark, primary-light, secondary, success, info, warning, danger, light, mid, and dark
-#system.color=var(--info)
-
-smtp.mx.domain=io.deephaven
-
-# Business Calendar directory
-Calendar.default=USNYSE
-# The etc path is where things are installed on a server, the configs path is
-# for development. This needs to be overridden for a console from a launcher.
-Calendar.importPath=/default_calendar_imports.txt
-
-# Plot Themes
-Plot.theme.default=LIGHT
-Plot.theme.internalPath=<devroot>/etc/chartthemes;<devroot>/configs/chartthemes;/etc/sysconfig/deephaven.d/chartthemes
-Plot.chartTitle.maxRowsInTitle=0
-
-###### Server's timezone #####
-server.timezone=America/New_York
-
-###### Measurement Options ######
-statsdriver.enabled=true
-allocation.stats.enabled=false
-measurement.comm_layer_timing=false
-measurement.partitioned_distributed_hashtables=false
+CompilerTools.logEnabledDefault=false
+UpdatePerformanceTracker.reportingMode=LISTENER_ONLY
+UpdatePerformanceTracker.reportIntervalMillis=60000
 measurement.per_thread_cpu=false
-measurement.log_and_reset=false
+allocation.stats.enabled=true
+statsdriver.enabled=true
+UpdateGraphProcessor.checkTableOperations=true
 
 #
 # NIO driver thread pool
@@ -45,123 +15,39 @@ measurement.log_and_reset=false
 # TODO: all of the created threads are waiting on RPCs or locks.
 #
 NIO.driver.workTimeout=100
-NIO.driver.initialThreadCount=2
-NIO.driver.maxThreadCount=400
+NIO.driver.initialThreadCount=4
+NIO.driver.maxThreadCount=16
 NIO.driver.useFast=true
 
-#
-# NIO wire-lag clock
-#
-NIO.wireLagClock.native=false
-
-#
-# Default envelope handler for WClient instances
-#
-Comm.fatalErrorHandlerFactoryClass=io.deephaven.console.utils.ProcessEnvironmentRedirectFactory
-
-##### CompilerTools Settings #####
-
-CompilerTools.logEnabledDefault=false
-
 QueryLibrary.defaultPackageImportList=default_package_imports.txt
 QueryLibrary.defaultClassImportList=default_class_imports.txt
 QueryLibrary.defaultStaticImportList=default_static_imports.txt
 
-########## Deephaven Groovy and Python Session defaults ##########
-
-GroovyDeephavenSession.defaultScriptPath=<devroot>
-GroovyDeephavenSession.initScripts=core/deephaven_core_utils.groovy
+StringUtils.cacheSize=0
 
-PythonDeephavenSession.defaultScriptPath=<devroot>
-PythonDeephavenSession.initScripts=core/deephaven_jpy_init.py
+TrackedFileHandleFactory.maxOpenFiles=1024
 
-WorkerPythonEnvironment.defaultScriptPath=<devroot>
-
-########## Deephaven UpdatePerformanceTracker Properties ##########
-UpdatePerformanceTracker.reportingMode=LISTENER_ONLY
-UpdatePerformanceTracker.reportIntervalMillis=60000
-
-########## Deephaven QueryPerformanceRecorder Properties ##########
-QueryPerformanceRecorder.packageFilter.internal=defaultPackageFilters.qpr
-
-########## Deephaven Local Data Refresh Properties ##########
-TableDataRefreshService.tableLocationsRefreshMillis=10000
-TableDataRefreshService.tableSizeRefreshMillis=1000
-
-# Defines the directory for pidfiles
-pidFileDirectory=/etc/deephaven/run
-
-default.processEnvironmentFactory=io.deephaven.util.process.DefaultProcessEnvironment$Factory
-
-columnsFile=DeephavenColumns.xml
-
-TrackedFileHandleFactory.maxOpenFiles=4096
-StringUtils.cacheSize=65536
-
-scriptSessionProviders=Groovy,Python
-scriptSessionExtension.groovy=Groovy
-scriptSessionExtension.py=Python
-scriptSessionProvider.Groovy=io.deephaven.engine.util.GroovyDeephavenSession
-scriptSessionProvider.Python=io.deephaven.engine.util.PythonDeephavenSession
-
-#
-# Web API Server configuration
-#
-Webapi.server.port=8123
-# Full path to an image for Web Login Splash and Settings Logo
-# Recommended 350x350 or smaller
-# Supports png, jpg, and svg
-# Set permissions to 755
-#Webapi.logo.splash=/full/path/logo.png
-#Webapi.logo.settings=/full/path/logo.jpg
-#Webapi.support.contact=test@domain.com
-#Webapi.support.documentation=https://test.domain.com
-# Default heap sizes in GB
-Webapi.console.heap.default=4
-Webapi.persistentquery.heap.default=4
-# A full path to a directory containing JavaScript Plugins
-#Webapi.plugins=/full/path/plugins
-# A comma separate list of names for an App level JavaScript Plugins
-#Webapi.app.plugins=AppPluginName1,AppPluginName2
-# Set to true to display system badge
-#Webapi.user.defaults.systemBadge=false
-
-OneClick.allowedPattern.USym=^[A-Za-z0-9/.]+$
-OneClick.enforceUpperCaseColumns=USym
+Calendar.default=USNYSE
+Calendar.importPath=/default_calendar_imports.txt
 
-UpdateGraphProcessor.checkTableOperations=true
+Plot.theme.default=LIGHT
+Plot.theme.internalPath=<devroot>/configs/chartthemes
 
-logroot=/var/log/deephaven
+NIO.wireLagClock.native=false
 
-defaultLogDir=<logroot>/misc
+WorkerPythonEnvironment.defaultScriptPath=<devroot>
 
-# Restricts what Parquet codecs are visible in the GUI
-Parquet.supportedCodecs=UNCOMPRESSED,SNAPPY
+QueryPerformanceRecorder.packageFilter.internal=defaultPackageFilters.qpr
 
-# JPY configuration
-jpy.pythonLib=/usr/lib64/libpython2.7.so.1.0
-jpy.jpyLib=/usr/lib64/python2.7/site-packages/jpy.so
-jpy.jdlLib=/usr/lib64/python2.7/site-packages/jdl.so
+########## Deephaven Groovy and Python Session defaults ##########
 
-[jpy.env=python27] {
-    jpy.programName=/dh/VEnvs/python27/bin/python2.7
-    jpy.pythonLib=/usr/lib64/libpython2.7.so.1.0
-    jpy.jpyLib=/dh/VEnvs/python27/lib/python2.7/site-packages/jpy.so
-    jpy.jdlLib=/dh/VEnvs/python27/lib/python2.7/site-packages/jdl.so
-}
+GroovyDeephavenSession.defaultScriptPath=<devroot>
+GroovyDeephavenSession.initScripts=core/deephaven_core_utils.groovy
 
-[jpy.env=python36] {
-    jpy.programName=/dh/VEnvs/python36/bin/python3.6
-    jpy.pythonLib=/usr/lib64/libpython3.6m.so.1.0
-    jpy.jpyLib=/dh/VEnvs/python36/lib/python3.6/site-packages/jpy.cpython-36m-x86_64-linux-gnu.so
-    jpy.jdlLib=/dh/VEnvs/python36/lib/python3.6/site-packages/jdl.cpython-36m-x86_64-linux-gnu.so
-}
+PythonDeephavenSession.defaultScriptPath=<devroot>
+PythonDeephavenSession.initScripts=core/deephaven_jpy_init.py
 
-[jpy.env=jupyter] {
-    jpy.programName=/dh/VEnvs/jupyter/bin/python3.6
-    jpy.pythonLib=/usr/lib64/libpython3.6m.so.1.0
-    jpy.jpyLib=/dh/VEnvs/jupyter/lib/python3.6/site-packages/jpy.cpython-36m-x86_64-linux-gnu.so
-    jpy.jdlLib=/dh/VEnvs/jupyter/lib/python3.6/site-packages/jdl.cpython-36m-x86_64-linux-gnu.so
-}
+###### Server's timezone #####
+server.timezone=America/New_York
 
-ShutdownManager.shutdownTimeoutMillis=60000
+default.processEnvironmentFactory=io.deephaven.util.process.DefaultProcessEnvironment$Factory
diff --git a/configs/grpc-api.prop b/configs/grpc-api.prop
diff --git a/docker/server-slim/src/main/docker/image-bootstrap.properties b/docker/server-slim/src/main/docker/image-bootstrap.properties
@@ -1,4 +1,4 @@
-Configuration.rootFile=grpc-api.prop
+Configuration.rootFile=dh-defaults.prop
 workspace=.
 devroot=.
 

diff --git a/docker/server/src/main/configure/image-bootstrap.properties b/docker/server/src/main/configure/image-bootstrap.properties
@@ -1,4 +1,4 @@
-Configuration.rootFile=grpc-api.prop
+Configuration.rootFile=dh-defaults.prop
 workspace=.
 devroot=.
 

diff --git a/pyintegration/deephaven2/_utils/bootstrap.py b/pyintegration/deephaven2/_utils/bootstrap.py
@@ -9,7 +9,7 @@
 
 DEFAULT_DEVROOT = os.environ.get('DEEPHAVEN_DEVROOT', "/tmp/pyintegration")
 DEFAULT_WORKSPACE = os.environ.get('DEEPHAVEN_WORKSPACE', "/tmp")
-DEFAULT_PROPFILE = os.environ.get('DEEPHAVEN_PROPFILE', '/app/resources/grpc-api-docker.prop')
+DEFAULT_PROPFILE = os.environ.get('DEEPHAVEN_PROPFILE', 'dh-defaults.prop')
 DEFAULT_CLASSPATH = os.environ.get('DEEPHAVEN_CLASSPATH', "/app/classes/*:/app/libs/*")
 
 

diff --git a/server/jetty/src/main/resources/bootstrap.properties b/server/jetty/src/main/resources/bootstrap.properties
@@ -1,4 +1,4 @@
-Configuration.rootFile=grpc-api-native.prop
+Configuration.rootFile=dh-defaults.prop
 io.deephaven.configuration.PropertyInputStreamLoader.override=io.deephaven.configuration.PropertyInputStreamLoaderTraditional
 LoggerFactory.silenceOnProcessEnvironment=true
 workspace=.

diff --git a/server/jetty/src/main/resources/grpc-api-native.prop b/server/jetty/src/main/resources/grpc-api-native.prop
diff --git a/server/netty/src/main/resources/bootstrap.properties b/server/netty/src/main/resources/bootstrap.properties
@@ -1,3 +1,3 @@
-Configuration.rootFile=grpc-api-native.prop
+Configuration.rootFile=dh-defaults.prop
 workspace=.
 devroot=.
diff --git a/server/netty/src/main/resources/grpc-api-native.prop b/server/netty/src/main/resources/grpc-api-native.prop