Jelajahi Sumber

Merge pull request #13603 from jakesmith/hpcc-23835-dali-env-remove

HPCC-23835 Remove unused environment.* files from Dali container

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 5 tahun lalu
induk
melakukan
37bd17f4f0

+ 0 - 2
dali/server/daserver.cpp

@@ -355,8 +355,6 @@ version: 1.0
 dali:
   name: dali
   dataPath: "/var/lib/HPCCSystems/dalistore"
-  sds:
-    environment: "/etc/HPCCSystems/environment.xml"
   logging:
     detail: 100
 )!!";

+ 0 - 3
dockerfiles/dali/Dockerfile

@@ -24,8 +24,5 @@ USER hpcc
 
 RUN mkdir -p /var/lib/HPCCSystems/dali
 WORKDIR /var/lib/HPCCSystems/dali
-COPY --chown=hpcc:hpcc environment.xml /etc/HPCCSystems/environment.xml
-COPY --chown=hpcc:hpcc environment.conf /etc/HPCCSystems/environment.conf
-#RUN daserver --init
 ENTRYPOINT ["daserver"]
 

+ 0 - 81
dockerfiles/dali/environment.conf

@@ -1,81 +0,0 @@
-## Default environment configuration file for OpenHPCC
-
-[DEFAULT]
-configs=/etc/HPCCSystems
-path=/opt/HPCCSystems
-classpath=/opt/HPCCSystems/classes
-runtime=/var/lib/HPCCSystems
-lock=/var/lock/HPCCSystems
-
-# Supported logging fields: AUD,CLS,DET,MID,TIM,DAT,PID,TID,NOD,JOB,USE,SES,COD,MLT,MCT,NNT,COM,QUO,PFX,ALL,STD
-logfields=TIM+DAT+MLT+MID+PID+TID+COD+QUO+PFX+AUD
-pid=/var/run/HPCCSystems
-log=/var/log/HPCCSystems
-user=hpcc
-group=hpcc
-
-#umask=022
-#nice=0
-
-home=/Users
-environment=environment.xml
-sourcedir=/etc/HPCCSystems/source
-blockname=HPCCSystems
-interface=*
-# enable epoll method for notification events (true/false)
-use_epoll=true
-#epoll_hdlperthrd=10
-# allow kernel pagecache flushing where enabled (true/false)
-allow_pgcache_flush=true
-# report UDP network stats
-udp_stats=true
-mpStart=7101
-mpEnd=7500
-mpSoMaxConn=128
-mpTraceLevel=0
-# enable SSL for dafilesrv remote file access (SSLNone/false | SSLOnly/true | SSLFirst | UnsecureFirst)
-# Enabling requires setting the HPCCPassPhrase, HPCCCertFile, and HPCCPrivateKeyFile values
-#dfsUseSSL=SSLNone
-
-#Specify location of HPCC PKI public/private key files
-# note: if HPCCPassPhrase specified it must be encrypted
-#HPCCPassPhrase=
-#HPCCCertificateFile=/Users/rchapman/certificate/certificate.pem
-#HPCCPublicKeyFile=/Users/rchapman/certificate/public.key.pem
-#HPCCPrivateKeyFile=/Users/rchapman/certificate/key.pem
-
-jvmoptions=-XX:-UsePerfData
-#Options to enable remote debugging of Java service or application
-#jvmoptions=-XX:-UsePerfData -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=2000
-#JNI_PATH=/absolute/path/to/alternative/libjvm.so
-
-# Python plugins can call python cleanup code on exit, but this seems to cause lockups in some Tensorflow examples
-# In most cases, skipping the cleanup is harmless and avoids these lockups
-skipPythonCleanup=true
-
-# Although HPCC platform includes plugins for both Python2 and Python3, only one may be safely enabled at a time
-# as the Python libraries export the same symbols for both versions. Enabling both may lead to unpredicatable results
-# including segfaults or undefined symbol errors.
-#
-# If you would prefer to use python 2 and disable python3, change the line below to read
-#  additionalPlugins=python2
-#
-# Multiple paths can be specified (separate with :, or ; on Windows).
-# Relative paths are assumed to be relative to /Users/rchapman/hpcc/opt/HPCCSystems/versioned
-additionalPlugins=python3
-
-# To en-/disable Drop Zone restriction.
-# Default is enabled (true).
-useDropZoneRestriction=true
-# If set, will force matching local file paths to become remote reads, e.g:
-#forceRemotePattern=/var/lib/HPCCSystems/hpcc-data/eclagent/*
-
-# Dafilesrv: default client side connection settings (NB: 0 = disable/use system defaults)
-#dafsConnectTimeoutSeconds=100
-#dafsConnectRetries=2
-#dafsMaxReceiveTimeSeconds=0
-
-# Dafilesrv: set to change number of seconds before retrying an unresponsive dafilesrv connection (default 10 seconds)
-# NB: for now this only applies to the last cached server 
-#dafsConnectFailRetrySeconds=10
-

+ 0 - 55
dockerfiles/dali/environment.xml

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Environment>
- <Software>
-  <DaliServerProcess build="_"
-                     buildSet="dali"
-                     name="mydali"
-                     recoverFromIncErrors="true">
-  <WhiteList enabled='false'/>                     
-  </DaliServerProcess>
-
-  <EclAgentProcess name="myeclagent"/>
-  <ThorCluster name="mythor"/>
-  <RoxieCluster name="myroxie"/>
-
-  
-  <Directories name="HPCCSystems">
-   <Category dir="/var/log/[NAME]/[INST]" name="log"/>
-   <Category dir="/var/lib/[NAME]/[INST]" name="run"/>
-   <Category dir="/etc/[NAME]/[INST]" name="conf"/>
-   <Category dir="/var/lib/[NAME]/[INST]/temp" name="temp"/>
-   <Category dir="/var/lib/[NAME]/hpcc-data/[COMPONENT]" name="data"/>
-   <Category dir="/var/lib/[NAME]/hpcc-data2/[COMPONENT]" name="data2"/>
-   <Category dir="/var/lib/[NAME]/hpcc-data3/[COMPONENT]" name="data3"/>
-   <Category dir="/var/lib/[NAME]/hpcc-mirror/[COMPONENT]" name="mirror"/>
-   <Category dir="/var/lib/[NAME]/queries/[INST]" name="query"/>
-   <Category dir="/var/lock/[NAME]/[INST]" name="lock"/>
-   <Category dir="/var/lib/[NAME]/hpcc-data4/[COMPONENT]" name="data4"/>
-   <Category dir="/var/lib/[NAME]/keys" name="keys"/>
-  </Directories>
-  <Topology build="_" buildSet="topology" name="topology">
-   <Cluster name="hthor" prefix="hthor" alias="">
-    <EclSchedulerProcess process="myeclscheduler"/>
-    <EclAgentProcess process="myeclagent"/>
-    <EclCCServerProcess process="myeclccserver"/>
-   </Cluster>
-   <Cluster name="thor" prefix="thor" alias="">
-    <EclAgentProcess process="myeclagent"/>
-    <EclCCServerProcess process="myeclccserver"/>
-    <ThorCluster process="mythor"/>
-    <EclSchedulerProcess process="myeclscheduler"/>
-   </Cluster>
-   <Cluster name="roxie" prefix="roxie" alias="">
-    <RoxieCluster process="myroxie"/>
-    <EclCCServerProcess process="myeclccserver"/>
-    <EclSchedulerProcess process="myeclscheduler"/>
-   </Cluster>
-   <Cluster name="thor_roxie" prefix="thor" alias="">
-    <EclCCServerProcess process="myeclccserver"/>
-    <ThorCluster process="mythor"/>
-    <RoxieCluster process="myroxie"/>
-    <EclSchedulerProcess process="myeclscheduler"/>
-   </Cluster>
-  </Topology>
- </Software>
-</Environment>