L2SS-398: create another hdbpp-es

docker-compose/archiver.yml

@@ -37,6 +37,25 @@ services:
           wait-for-it.sh ${TANGO_HOST} --timeout=30 --strict --
                hdbppes-srv 01"
       restart: unless-stopped
+  
+  hdbpp-es2:
+      image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/tango-archiver:2021-05-28
+      networks:
+      - control
+      container_name: hdbpp-es2
+      depends_on:
+        - databaseds
+        - dsconfig
+        - archiver-maria-db
+      environment:
+        - TANGO_HOST=${TANGO_HOST}
+        - HdbManager=archiving/hdbpp/confmanager01
+      command: >
+        /bin/bash -c "
+          wait-for-it.sh archiver-maria-db:3306 --timeout=30 --strict --
+          wait-for-it.sh ${TANGO_HOST} --timeout=30 --strict --
+            hdbppes-srv 02"
+      restart: unless-stopped
 
   hdbpp-cm:
       image: ${LOCAL_DOCKER_REGISTRY_HOST}/${LOCAL_DOCKER_REGISTRY_USER}/tango-archiver:${TANGO_ARCHIVER_VERSION}

docker/tango/tango-archiver/Dockerfile

@@ -104,6 +104,32 @@ RUN cd hdbpp-es \
     --requires="libzmq5,libomniorb4-2,libcos4-2,libomnithread4" \
     make install
 
+RUN git clone -b v1.0.1 --depth 1 https://github.com/tango-controls-hdbpp/hdbpp-es.git
+
+RUN cd hdbpp-es2 \
+ && make TANGO_INC=/usr/local/include/tango
+
+RUN cd hdbpp-es2 \
+ && checkinstall \
+    --install=yes \
+    --fstrans=no \
+    --showinstall=no \
+    --backup=no \
+    --type=debian \
+    --pkgsource="https://github.com/tango-controls-hdbpp/hdbpp-es" \
+    --pkglicense="GPLv3" \
+    --deldesc=no \
+    --nodoc \
+    --strip \
+    --stripso \
+    --maintainer="tango" \
+    --pkgarch=$(dpkg --print-architecture) \
+    --pkgversion="1.0.1" \
+    --pkgrelease="SNAPSHOT" \
+    --pkgname="hdbpp-es" \
+    --requires="libzmq5,libomniorb4-2,libcos4-2,libomnithread4" \
+    make install
+
 RUN git clone -b v1.0.0 --depth 1 https://github.com/tango-controls-hdbpp/hdbpp-cm.git
 
 RUN cd hdbpp-cm \
@@ -139,6 +165,7 @@ RUN apt-get update && \
 RUN dpkg -i /libhdbpp/build/libhdbpp_1.0.0-SNAPSHOT_amd64.deb
 RUN dpkg -i /libhdbpp-mysql/libhdbpp-mysql_1.1.0-SNAPSHOT_amd64.deb
 RUN dpkg -i /hdbpp-es/hdbpp-es_1.0.1-SNAPSHOT_amd64.deb
+RUN dpkg -i /hdbpp-es2/hdbpp-es_1.0.1-SNAPSHOT_amd64.deb
 RUN dpkg -i /hdbpp-cm/hdbpp-cm_1.0.0-SNAPSHOT_amd64.deb
 
 RUN ldconfig

docker/tango/tango-archiver/data/archiver-devices.json

@@ -13,6 +13,19 @@
                         }
                     }
                 }
+            },
+            "02": {
+                "HdbEventSubscriber": {
+                    "archiving/hdbpp/eventsubscriber02": {
+                        "attribute_properties": {},
+                        "properties": {
+                            "CheckPeriodicTimeoutDelay": ["5"],
+                            "PollingThreadPeriod": ["3"],
+                            "LibConfiguration": ["host=archiver-maria-db","libname=libhdb++mysql.so.6","dbname=hdbpp","port=3306", "user=tango", "password=tango"],
+                            "polled_attr": []
+                        }
+                    }
+                }
             }
         },
         "hdbppcm-srv": {
@@ -21,7 +34,7 @@
                     "archiving/hdbpp/confmanager01": {
                         "attribute_properties": {},
                         "properties": {
-                            "ArchiverList": ["archiving/hdbpp/eventsubscriber01"],
+                            "ArchiverList": ["archiving/hdbpp/eventsubscriber01","archiving/hdbpp/eventsubscriber02"],
                             "MaxSearchSize": ["1000"],
                             "LibConfiguration": ["host=archiver-maria-db","libname=libhdb++mysql.so.6","dbname=hdbpp","port=3306", "user=tango", "password=tango"],
                             "polled_attr": []