rapid-cdn: Drop dependece on slave-log-directory-dict

If slave section depend on slave-log-directory-dict they are being reinstalled
on each change in this section, so instead directly provide a path.

slave-log-directory-dict is only used to pass directory information about all
slaves to slave introsection mechnism, write it down in the comment.

software/rapid-cdn/buildout.hash.cfg

@@ -30,7 +30,7 @@ md5sum = 653e8249ee71c3fa71b172fa3d2a4207
 
 [profile-slave-list]
 filename = instance-slave-list.cfg.in
-md5sum = 96bd66e98c7b4492ab4aba46e0e14e13
+md5sum = 8d6d2280ad47b431c433495bf9809adc
 
 [profile-master-publish-slave-information]
 filename = instance-master-publish-slave-information.cfg.in

software/rapid-cdn/instance-slave-list.cfg.in

@@ -36,6 +36,8 @@ context =
 
 # empty sections if no slaves are available
 [slave-log-directory-dict]
+{#- Note: This section is only to build dictionary of all slave information about their directories #}
+{#-       It shall not be referenced as ${slave-log-directory-dict: by slaves, as this section is often updated #}
 [slave-password]
 [slave-htpasswd]
 
@@ -280,7 +282,8 @@ context =
 {#-   Set slave logrotate entry #}
 [{{slave_log_directory_section}}]
 recipe = slapos.cookbook:mkdirectory
-log-directory = {{ '${slave-log-directory-dict:' + slave_reference + '}' }}
+{#- Direct reference to slave_log_folder is on purpose to not depend on slave-log-directory-dict #}
+log-directory = {{ slave_log_folder }}
 
 [{{slave_logrotate_section}}]
 <= logrotate-entry-base

software/rapid-cdn/test/test.py

@@ -1146,7 +1146,8 @@ class SlaveHttpFrontendTestCase(HttpFrontendTestCase):
     return default_instance
 
   @classmethod
-  def requestSlaveInstance(cls, partition_reference, partition_parameter_kw):
+  def requestSlaveInstance(
+    cls, partition_reference, partition_parameter_kw, state='started'):
     software_url = cls.getSoftwareURL()
     software_type = cls.getInstanceSoftwareType()
     cls.logger.debug(
@@ -1157,7 +1158,8 @@ class SlaveHttpFrontendTestCase(HttpFrontendTestCase):
       software_type=software_type,
       partition_reference=partition_reference,
       partition_parameter_kw=partition_parameter_kw,
-      shared=True
+      shared=True,
+      state=state
     )
 
   @classmethod
@@ -7344,6 +7346,74 @@ backend _health-check-default-http
     self.assertEqual(result.status_code, http.client.SERVICE_UNAVAILABLE)
 
 
+class TestSlaveManagement(SlaveHttpFrontendTestCase, TestDataMixin, AtsMixin):
+  parameter_dict = {
+    'domain': 'example.com',
+    'port': HTTPS_PORT,
+    'plain_http_port': HTTP_PORT,
+    'kedifa_port': KEDIFA_PORT,
+    'caucase_port': CAUCASE_PORT,
+    'request-timeout': '12',
+  }
+
+  @classmethod
+  def getSlaveParameterDictDict(cls):
+    return {
+      'first': {
+      },
+      'deleted': {
+      }
+    }
+
+  def clean_frontend_log_file(self):
+    frontend_partition_config = glob.glob(os.path.join(
+      self.instance_path, '*', 'etc', 'frontend-haproxy.cfg'))
+    self.assertEqual(1, len(frontend_partition_config))
+    frontend_partition_config = frontend_partition_config[0]
+    frontend_partition = os.path.realpath(os.path.join(
+      frontend_partition_config, '..', '..'))
+    slapgrid_log_file = os.path.join(
+      frontend_partition, '.slapgrid', 'log', 'instance.log')
+    os.rename(slapgrid_log_file, slapgrid_log_file + self.id())
+    return slapgrid_log_file
+
+  def test_added_slave(self):
+    # request additional slave
+    self.requestSlaveInstance('second', {})
+    slapgrid_log_file = self.clean_frontend_log_file()
+    self.slap.waitForInstance(self.instance_max_retry)
+
+    # assert it worked with inspecting the log file, for now the only way
+    # to check how slapos node reacted to the change
+    with open(slapgrid_log_file) as fh:
+      slapgrid_log = fh.read()
+    self.assertNotIn('Installing _first-', slapgrid_log)
+    self.assertNotIn('Uninstalling _first-', slapgrid_log)
+    self.assertIn('Updating _first-', slapgrid_log)
+
+    self.assertIn('Installing _second-', slapgrid_log)
+    self.assertNotIn('Uninstalling _second-', slapgrid_log)
+    self.assertNotIn('Updating _second-', slapgrid_log)
+
+  def test_destroyed_slave(self):
+    self.requestSlaveInstance('deleted', {}, 'destroyed')
+    slapgrid_log_file = self.clean_frontend_log_file()
+    self.slap.waitForInstance(self.instance_max_retry)
+
+    # assert it worked with inspecting the log file, for now the only way
+    # to check how slapos node reacted to the change
+    with open(slapgrid_log_file) as fh:
+      slapgrid_log = fh.read()
+
+    self.assertNotIn('Installing _first-', slapgrid_log)
+    self.assertNotIn('Uninstalling _first-', slapgrid_log)
+    self.assertIn('Updating _first-', slapgrid_log)
+
+    self.assertNotIn('Installing _deleted-', slapgrid_log)
+    self.assertIn('Uninstalling _deleted-', slapgrid_log)
+    self.assertNotIn('Updating _deleted-', slapgrid_log)
+
+
 if __name__ == '__main__':
   class HTTP6Server(backend.ThreadedHTTPServer):
     address_family = socket.AF_INET6

software/rapid-cdn/test/test_data/test.TestSlaveManagement.test00cluster_request_instance_parameter_dict.txt

+[
+  {
+    "full_address_list": [],
+    "instance_title": "testing partition 0",
+    "root_instance_title": "testing partition 0",
+    "slap_computer_id": "local",
+    "slap_computer_partition_id": "T-0",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
+    "slap_software_type": "default",
+    "slave_instance_list": [
+      {
+        "slap_software_type": "default",
+        "slave_reference": "_deleted",
+        "slave_title": "_deleted"
+      },
+      {
+        "slap_software_type": "default",
+        "slave_reference": "_first",
+        "slave_title": "_first"
+      }
+    ],
+    "timestamp": "@@TIMESTAMP@@"
+  },
+  {
+    "_": {
+      "cluster-identification": "testing partition 0",
+      "monitor-cors-domains": "monitor.app.officejs.com",
+      "monitor-httpd-port": "8402",
+      "monitor-password": "@@monitor-password@@",
+      "monitor-username": "admin",
+      "slave-list": [
+        {
+          "slave_reference": "_deleted"
+        },
+        {
+          "slave_reference": "_first"
+        }
+      ]
+    },
+    "full_address_list": [],
+    "instance_title": "kedifa",
+    "root_instance_title": "testing partition 0",
+    "slap_computer_id": "local",
+    "slap_computer_partition_id": "T-1",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
+    "slap_software_type": "kedifa",
+    "slave_instance_list": [],
+    "timestamp": "@@TIMESTAMP@@"
+  },
+  {
+    "_": {
+      "backend-client-caucase-url": "http://[@@_ipv6_address@@]:8990",
+      "cluster-identification": "testing partition 0",
+      "enable-http3": "false",
+      "extra_slave_instance_list": "[{\"slave_reference\": \"_deleted\"}, {\"slave_reference\": \"_first\"}]",
+      "frontend-name": "caddy-frontend-1",
+      "http3-port": "443",
+      "kedifa-caucase-url": "http://[@@_ipv6_address@@]:8890",
+      "master-key-download-url": "https://[@@_ipv6_address@@]:7879/@@master-key-download-url_endpoint@@",
+      "monitor-cors-domains": "monitor.app.officejs.com",
+      "monitor-httpd-port": 8411,
+      "monitor-password": "@@monitor-password@@",
+      "monitor-username": "admin",
+      "slave-kedifa-information": "{\"_deleted\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:8890\", \"key-download-url\": \"https://[@@_ipv6_address@@]:7879/@@deleted_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:7879/@@deleted_key-generate-auth-url@@/@@deleted_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:7879/@@deleted_key-generate-auth-url@@?auth=\"}, \"_first\": {\"kedifa-caucase-url\": \"http://[@@_ipv6_address@@]:8890\", \"key-download-url\": \"https://[@@_ipv6_address@@]:7879/@@first_key-generate-auth-url@@\", \"key-generate-auth-url\": \"https://[@@_ipv6_address@@]:7879/@@first_key-generate-auth-url@@/@@deleted_key-upload-url@@\", \"key-upload-url\": \"https://[@@_ipv6_address@@]:7879/@@first_key-generate-auth-url@@?auth=\"}}"
+    },
+    "full_address_list": [],
+    "instance_title": "caddy-frontend-1",
+    "root_instance_title": "testing partition 0",
+    "slap_computer_id": "local",
+    "slap_computer_partition_id": "T-2",
+    "slap_software_release_url": "@@00getSoftwareURL@@",
+    "slap_software_type": "single-custom-personal",
+    "slave_instance_list": [],
+    "timestamp": "@@TIMESTAMP@@"
+  }
+]

software/rapid-cdn/test/test_data/test.TestSlaveManagement.test00file_list_log.txt

+T-0/var/log/monitor-httpd-access.log
+T-0/var/log/monitor-httpd-error.log
+T-0/var/log/slapgrid-T-0-error.log
+T-1/var/log/expose-csr.log
+T-1/var/log/kedifa.log
+T-1/var/log/monitor-httpd-access.log
+T-1/var/log/monitor-httpd-error.log
+T-2/var/log/backend-haproxy.log
+T-2/var/log/expose-csr.log
+T-2/var/log/frontend-haproxy.log
+T-2/var/log/monitor-httpd-access.log
+T-2/var/log/monitor-httpd-error.log
+T-2/var/log/slave-introspection-access.log
+T-2/var/log/slave-introspection-error.log
+T-2/var/log/trafficserver/manager.log

software/rapid-cdn/test/test_data/test.TestSlaveManagement.test00file_list_run.txt

+T-0/var/run/monitor-httpd.pid
+T-1/var/run/kedifa.pid
+T-1/var/run/logrotate-setup.state
+T-1/var/run/monitor-httpd.pid
+T-2/var/run/backend-haproxy-rsyslogd.pid
+T-2/var/run/backend-haproxy.pid
+T-2/var/run/backend_haproxy_configuration_last_state
+T-2/var/run/backend_haproxy_graceful_configuration_state_signature
+T-2/var/run/bhlog.sck
+T-2/var/run/fhlog.sck
+T-2/var/run/frontend-haproxy-rsyslogd.pid
+T-2/var/run/graceful_configuration_state_signature
+T-2/var/run/httpd.pid
+T-2/var/run/logrotate-setup.state
+T-2/var/run/monitor-httpd.pid
+T-2/var/run/slave-introspection.pid
+T-2/var/run/slave_introspection_configuration_last_state
+T-2/var/run/slave_introspection_graceful_configuration_state_signature

software/rapid-cdn/test/test_data/test.TestSlaveManagement.test00supervisor_state.txt

+T-0:aibcc-user-caucase-updater-on-watch RUNNING
+T-0:aikc-user-caucase-updater-on-watch RUNNING
+T-0:bootstrap-monitor EXITED
+T-0:caucased-backend-client-{hash-generic}-on-watch RUNNING
+T-0:certificate_authority-{hash-generic}-on-watch RUNNING
+T-0:crond-{hash-generic}-on-watch RUNNING
+T-0:master-introspection-server-{hash-master-introspection}-on-watch RUNNING
+T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
+T-0:monitor-httpd-graceful EXITED
+T-1:bootstrap-monitor EXITED
+T-1:caucase-updater-on-watch RUNNING
+T-1:caucased-{hash-generic}-on-watch RUNNING
+T-1:certificate_authority-{hash-generic}-on-watch RUNNING
+T-1:crond-{hash-generic}-on-watch RUNNING
+T-1:expose-csr-{hash-generic}-on-watch RUNNING
+T-1:kedifa-{hash-generic}-on-watch RUNNING
+T-1:kedifa-reloader EXITED
+T-1:logrotate-setup-validate EXITED
+T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
+T-1:monitor-httpd-graceful EXITED
+T-2:backend-client-login-certificate-caucase-updater-on-watch RUNNING
+T-2:backend-haproxy-{hash-backend-haproxy-T-2}-on-watch RUNNING
+T-2:backend-haproxy-rsyslogd-{hash-generic}-on-watch RUNNING
+T-2:backend-haproxy-safe-graceful EXITED
+T-2:bootstrap-monitor EXITED
+T-2:certificate_authority-{hash-generic}-on-watch RUNNING
+T-2:crond-{hash-generic}-on-watch RUNNING
+T-2:expose-csr-{hash-generic}-on-watch RUNNING
+T-2:frontend-haproxy-{hash-generic}-on-watch RUNNING
+T-2:frontend-haproxy-rsyslogd-{hash-generic}-on-watch RUNNING
+T-2:frontend-haproxy-safe-graceful EXITED
+T-2:kedifa-login-certificate-caucase-updater-on-watch RUNNING
+T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
+T-2:logrotate-setup-validate EXITED
+T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
+T-2:monitor-httpd-graceful EXITED
+T-2:slave-instrospection-nginx-{hash-generic}-on-watch RUNNING
+T-2:slave-introspection-safe-graceful EXITED
+T-2:trafficserver-{hash-generic}-on-watch RUNNING
+T-2:trafficserver-reload EXITED

software/rapid-cdn/test/test_data/test.TestSlaveManagement.test_file_list_etc_cron_d.txt

+T-0/etc/cron.d/logrotate
+T-0/etc/cron.d/monitor-configurator
+T-0/etc/cron.d/monitor-globalstate
+T-0/etc/cron.d/monitor_collect
+T-1/etc/cron.d/logrotate
+T-1/etc/cron.d/monitor-configurator
+T-1/etc/cron.d/monitor-globalstate
+T-1/etc/cron.d/monitor_collect
+T-2/etc/cron.d/logrotate
+T-2/etc/cron.d/monitor-configurator
+T-2/etc/cron.d/monitor-globalstate
+T-2/etc/cron.d/monitor_collect
+T-2/etc/cron.d/trafficserver-logrotate

software/rapid-cdn/test/test_data/test.TestSlaveManagement.test_file_list_plugin.txt

+T-0/etc/plugin/__init__.py
+T-0/etc/plugin/aibcc-sign-promise.py
+T-0/etc/plugin/aibcc-user-caucase-updater.py
+T-0/etc/plugin/aikc-sign-promise.py
+T-0/etc/plugin/aikc-user-caucase-updater.py
+T-0/etc/plugin/buildout-T-0-status.py
+T-0/etc/plugin/caucased-backend-client.py
+T-0/etc/plugin/check-backend-haproxy-statistic-url-frontend-node-1.py
+T-0/etc/plugin/check-free-disk-space.py
+T-0/etc/plugin/check-monitor-frontend-password.py
+T-0/etc/plugin/master-introspection-server-ip-port-listening.py
+T-0/etc/plugin/master-key-download-url-ready-promise.py
+T-0/etc/plugin/master-key-generate-auth-url-ready-promise.py
+T-0/etc/plugin/master-key-upload-url-ready-promise.py
+T-0/etc/plugin/monitor-bootstrap-status.py
+T-0/etc/plugin/monitor-http-frontend.py
+T-0/etc/plugin/monitor-httpd-listening-on-tcp.py
+T-0/etc/plugin/publish-failsafe-error.py
+T-0/etc/plugin/rejected-slave.py
+T-1/etc/plugin/__init__.py
+T-1/etc/plugin/buildout-T-1-status.py
+T-1/etc/plugin/caucased.py
+T-1/etc/plugin/check-free-disk-space.py
+T-1/etc/plugin/check-monitor-frontend-password.py
+T-1/etc/plugin/expose-csr-ip-port-listening.py
+T-1/etc/plugin/kedifa-http-reply.py
+T-1/etc/plugin/monitor-bootstrap-status.py
+T-1/etc/plugin/monitor-http-frontend.py
+T-1/etc/plugin/monitor-httpd-listening-on-tcp.py
+T-1/etc/plugin/promise-kedifa-auth-ready.py
+T-1/etc/plugin/promise-logrotate-setup.py
+T-2/etc/plugin/__init__.py
+T-2/etc/plugin/backend-client-caucase-updater.py
+T-2/etc/plugin/backend-haproxy-configuration.py
+T-2/etc/plugin/backend-haproxy-statistic-frontend.py
+T-2/etc/plugin/backend_haproxy_http.py
+T-2/etc/plugin/backend_haproxy_https.py
+T-2/etc/plugin/buildout-T-2-status.py
+T-2/etc/plugin/caucase-updater.py
+T-2/etc/plugin/check-free-disk-space.py
+T-2/etc/plugin/check-monitor-frontend-password.py
+T-2/etc/plugin/expose-csr-ip-port-listening.py
+T-2/etc/plugin/frontend-frontend-haproxy-configuration-promise.py
+T-2/etc/plugin/frontend_haproxy_ipv4_http.py
+T-2/etc/plugin/frontend_haproxy_ipv4_https.py
+T-2/etc/plugin/frontend_haproxy_ipv6_http.py
+T-2/etc/plugin/frontend_haproxy_ipv6_https.py
+T-2/etc/plugin/monitor-bootstrap-status.py
+T-2/etc/plugin/monitor-http-frontend.py
+T-2/etc/plugin/monitor-httpd-listening-on-tcp.py
+T-2/etc/plugin/promise-key-download-url-ready.py
+T-2/etc/plugin/promise-logrotate-setup.py
+T-2/etc/plugin/slave-introspection-configuration.py
+T-2/etc/plugin/slave_introspection_https.py
+T-2/etc/plugin/trafficserver-cache-availability.py
+T-2/etc/plugin/trafficserver-port-listening.py