Merge pull request #14954 from wangkx/h25837

HPCC-25837 Remove ESP ws_machine service from container build

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Merged-by: Gavin Halliday <ghalliday@hpccsystems.com>

esp/applications/eclservices/application.yaml

@@ -9,7 +9,6 @@ application:
    - WsFileIO
    - WsPackageProcess
    - FileSpray
-   - ws_machine
    - ws_elk
    - ws_access
    - ws_account

esp/applications/eclservices/eclservices.yaml

@@ -65,118 +65,4 @@ eclservices:
             description: JWT token cache
             default: false
             maxValSize: 32768
-   ws_machine:
-      excludePartitions: "/dev*,/sys*,/proc*,/run*,/boot"
-      monitorDaliFileServer: false
-      UseDefaultSSHUserID: false
-      UseDefaultPIDFileName: true
-      ProcessFilters:
-        Platform:
-        - name: Windows
-          ProcessFilter:
-          - name: any
-            Process:
-              name: dafilesrv
-          - name: AttrServerProcess
-            Process:
-              name: attrserver
-          - name: DaliProcess
-            Process:
-              name: daserver
-          - name: DfuServerProcess
-            multipleInstances: true
-            Process:
-              name: dfuserver
-          - name: EclCCServerProcess
-            multipleInstances: true
-            Process:
-              name: eclccserver
-          - name: EclServerProcess
-            multipleInstances: true
-            Process:
-              name: eclserver
-          - name: EspProcess
-            multipleInstances: true
-            Process:
-              - name: esp
-              - name: dafilesrv
-                remove: true
-          - name: FTSlaveProcess
-            Process:
-              name: ftslave
-          - name: RoxieServerProcess
-            Process:
-              name: roxie
-          - name: RoxieSlaveProcess
-            Process:
-              name: roxie
-          - name: SchedulerProcess
-            Process:
-              name: scheduler
-          - name: ThorMasterProcess
-            Process:
-              name: thormaster
-          - name: ThorSlaveProcess
-            Process:
-              name: thorslave
-          - name: SashaServerProcess
-            Process:
-              name: saserver
-          - name: Linux
-            ProcessFilter:
-            - name: any
-              Process:
-                name: dafilesrv
-            - name: AttrServerProcess
-              Process:
-                name: attrserver
-            - name: DaliProcess
-              Process:
-                name: daserver
-            - name: DfuServerProcess
-              multipleInstances: true
-              Process:
-                name: dfuserver
-            - name: EclCCServerProcess
-              multipleInstances: true
-              Process:
-                name: eclccserver
-            - name: EclServerProcess
-              multipleInstances: true
-              Process:
-                name: eclserver
-            - name: EspProcess
-              multipleInstances: true
-              Process:
-              - name: esp
-              - name: dafilesrv
-                remove: true
-            - name: FTSlaveProcess
-              Process:
-                name: ftslave
-            - name: RoxieServerProcess
-              Process:
-                name: roxie
-            - name: RoxieSlaveProcess
-              Process:
-                name: roxie
-            - name: SchedulerProcess
-              Process:
-                name: scheduler
-            - name: ThorMasterProcess
-              Process:
-                name: thormaster
-            - name: ThorSlaveProcess
-              Process:
-                name: thorslave
-            - name: SashaServerProcess
-              Process:
-                name: saserver
-            - name: GenesisServerProcess
-              multipleInstances: true
-              Process:
-              - name: mysql
-              - name: httpd
-              - name: atftpd
-              - name: dhcpd
-            
+            

esp/applications/eclservices/ldap_authorization_map.yaml

@@ -135,17 +135,6 @@ ldap:
          -  path: FileIOAccess
             resource: FileIOAccess
             description: Access to files in dropzone
-      ws_machine:
-         Feature:
-         -  path: MachineInfoAccess
-            resource: MachineInfoAccess
-            description: Access to machine information
-         -  path: MetricsAccess
-            resource: MetricsAccess
-            description: Access to SNMP metrics information
-         -  path: ExecuteAccess
-            resource: ExecuteAccess
-            description: Access to remote execution
       ws_config:
          Feature:
          -  path: ConfigAccess

esp/applications/eclservices/plugins.yaml

@@ -11,7 +11,6 @@ service_plugins:
   ws_elk: ws_elk
   ws_esdlconfig: ws_esdlconfig
   WsFileIO: ws_fileio
-  ws_machine: ws_machine
   WsPackageProcess: ws_packageprocess
   ws_store: ws_store
   WSESPControl: wsespcontrol
@@ -29,7 +28,6 @@ binding_plugins:
   ws_elk: ws_elk
   ws_esdlconfig: ws_esdlconfig
   WsFileIO: ws_fileio
-  ws_machine: ws_machine
   WsPackageProcess: ws_packageprocess
   ws_store: ws_store
   WsTopology: ws_topology

esp/applications/eclwatch/application.yaml

@@ -9,7 +9,6 @@ application:
    - WsFileIO
    - WsPackageProcess
    - FileSpray
-   - ws_machine
    - ws_elk
    - ws_access
    - ws_account

esp/applications/eclwatch/eclwatch.yaml

@@ -63,117 +63,3 @@ eclwatch:
             description: JWT token cache
             default: false
             maxValSize: 32768
-   ws_machine:
-      excludePartitions: "/dev*,/sys*,/proc*,/run*,/boot"
-      monitorDaliFileServer: false
-      UseDefaultSSHUserID: false
-      UseDefaultPIDFileName: true
-      ProcessFilters:
-        Platform:
-        - name: Windows
-          ProcessFilter:
-          - name: any
-            Process:
-              name: dafilesrv
-          - name: AttrServerProcess
-            Process:
-              name: attrserver
-          - name: DaliProcess
-            Process:
-              name: daserver
-          - name: DfuServerProcess
-            multipleInstances: true
-            Process:
-              name: dfuserver
-          - name: EclCCServerProcess
-            multipleInstances: true
-            Process:
-              name: eclccserver
-          - name: EclServerProcess
-            multipleInstances: true
-            Process:
-              name: eclserver
-          - name: EspProcess
-            multipleInstances: true
-            Process:
-              - name: esp
-              - name: dafilesrv
-                remove: true
-          - name: FTSlaveProcess
-            Process:
-              name: ftslave
-          - name: RoxieServerProcess
-            Process:
-              name: roxie
-          - name: RoxieSlaveProcess
-            Process:
-              name: roxie
-          - name: SchedulerProcess
-            Process:
-              name: scheduler
-          - name: ThorMasterProcess
-            Process:
-              name: thormaster
-          - name: ThorSlaveProcess
-            Process:
-              name: thorslave
-          - name: SashaServerProcess
-            Process:
-              name: saserver
-        - name: Linux
-          ProcessFilter:
-          - name: any
-            Process:
-              name: dafilesrv
-          - name: AttrServerProcess
-            Process:
-              name: attrserver
-          - name: DaliProcess
-            Process:
-              name: daserver
-          - name: DfuServerProcess
-            multipleInstances: true
-            Process:
-              name: dfuserver
-          - name: EclCCServerProcess
-            multipleInstances: true
-            Process:
-              name: eclccserver
-          - name: EclServerProcess
-            multipleInstances: true
-            Process:
-              name: eclserver
-          - name: EspProcess
-            multipleInstances: true
-            Process:
-            - name: esp
-            - name: dafilesrv
-              remove: true
-          - name: FTSlaveProcess
-            Process:
-              name: ftslave
-          - name: RoxieServerProcess
-            Process:
-              name: roxie
-          - name: RoxieSlaveProcess
-            Process:
-              name: roxie
-          - name: SchedulerProcess
-            Process:
-              name: scheduler
-          - name: ThorMasterProcess
-            Process:
-              name: thormaster
-          - name: ThorSlaveProcess
-            Process:
-              name: thorslave
-          - name: SashaServerProcess
-            Process:
-              name: saserver
-          - name: GenesisServerProcess
-            multipleInstances: true
-            Process:
-            - name: mysql
-            - name: httpd
-            - name: atftpd
-            - name: dhcpd

esp/applications/eclwatch/ldap_authorization_map.yaml

@@ -136,17 +136,6 @@ ldap:
          -  path: FileIOAccess
             resource: FileIOAccess
             description: Access to files in dropzone
-      ws_machine:
-         Feature:
-         -  path: MachineInfoAccess
-            resource: MachineInfoAccess
-            description: Access to machine information
-         -  path: MetricsAccess
-            resource: MetricsAccess
-            description: Access to SNMP metrics information
-         -  path: ExecuteAccess
-            resource: ExecuteAccess
-            description: Access to remote execution
       ws_config:
          Feature:
          -  path: ConfigAccess

esp/applications/eclwatch/plugins.yaml

@@ -12,7 +12,6 @@ service_plugins:
   ws_elk: ws_elk
   ws_esdlconfig: ws_esdlconfig
   WsFileIO: ws_fileio
-  ws_machine: ws_machine
   WsPackageProcess: ws_packageprocess
   ws_store: ws_store
   WSESPControl: wsespcontrol
@@ -33,7 +32,6 @@ binding_plugins:
   ws_elk: ws_elk
   ws_esdlconfig: ws_esdlconfig
   WsFileIO: ws_fileio
-  ws_machine: ws_machine
   WsPackageProcess: ws_packageprocess
   ws_store: ws_store
   WsTopology: ws_topology

esp/scm/espscm.cmake

@@ -32,7 +32,6 @@ set ( ESPSCM_SRCS
       soapesp.ecm
       ws_ecl_client.ecm
       ws_fs.ecm
-      ws_machine.ecm
       ws_smc.ecm
       ws_topology.ecm
       ws_workunits_struct.ecm
@@ -52,6 +51,10 @@ set ( ESPSCM_SRCS
       ws_resources.ecm
     )
 
+if (NOT CONTAINERIZED)
+    list ( APPEND ESPSCM_SRCS ws_machine.ecm )
+endif()
+
 foreach ( loop_var ${ESPSCM_SRCS} )
     string(  REGEX REPLACE "[.]ecm" "" result ${loop_var} )
     if (SCM_BUILD)

esp/services/CMakeLists.txt

@@ -22,7 +22,6 @@ HPCC_ADD_SUBDIRECTORY (ws_dfu "PLATFORM")
 HPCC_ADD_SUBDIRECTORY (ws_ecl "PLATFORM")
 HPCC_ADD_SUBDIRECTORY (ws_fileio "PLATFORM")
 HPCC_ADD_SUBDIRECTORY (ws_fs "PLATFORM")
-HPCC_ADD_SUBDIRECTORY (ws_machine "PLATFORM")
 HPCC_ADD_SUBDIRECTORY (ws_smc "PLATFORM")
 HPCC_ADD_SUBDIRECTORY (ws_topology "PLATFORM")
 HPCC_ADD_SUBDIRECTORY (ws_workunits "PLATFORM")
@@ -41,6 +40,7 @@ HPCC_ADD_SUBDIRECTORY (ws_codesign "PLATFORM")
 HPCC_ADD_SUBDIRECTORY (ws_resources "PLATFORM")
 HPCC_ADD_SUBDIRECTORY (ws_dali "PLATFORM")
 if (NOT CONTAINERIZED)
+  HPCC_ADD_SUBDIRECTORY (ws_machine "PLATFORM")
   HPCC_ADD_SUBDIRECTORY (ws_config "PLATFORM")
   HPCC_ADD_SUBDIRECTORY (WsDeploy "PLATFORM")
 endif()

esp/services/ws_smc/CMakeLists.txt

@@ -83,7 +83,6 @@ target_link_libraries ( ws_smc
          remote 
          dalibase 
          environment 
-         ws_machine 
          dalift 
          dllserver 
          nbcd 
@@ -103,6 +102,13 @@ target_link_libraries ( ws_smc
          schedulectrl 
          ws_workunits 
     )
+
+if (NOT CONTAINERIZED)
+    target_link_libraries ( ws_smc
+        ws_machine
+    )
+endif()
+
 IF (USE_OPENSSL)
     target_link_libraries ( ws_smc
     	securesocket