From 6b63b72a13ecc72b211938f2910185919e6a07a9 Mon Sep 17 00:00:00 2001
From: Ilya Kreymer <ikreymer@gmail.com>
Date: Fri, 16 Sep 2022 16:28:31 -0700
Subject: [PATCH] backend config tweaks: - send SIGUSR2 instead of SIGUSR1 for
 scale down - chart: move persistentVolumeClaimRetentionPolicy to correct
 place in chart

---
 backend/btrixcloud/k8s/crawl_job.py           |  2 +-
 backend/btrixcloud/k8s/templates/crawler.yaml | 16 ++++++++++------
 backend/btrixcloud/swarm/crawl_job.py         |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/backend/btrixcloud/k8s/crawl_job.py b/backend/btrixcloud/k8s/crawl_job.py
index bb9c0113..5256d1e3 100644
--- a/backend/btrixcloud/k8s/crawl_job.py
+++ b/backend/btrixcloud/k8s/crawl_job.py
@@ -30,7 +30,7 @@ class K8SCrawlJob(K8SJobMixin, CrawlJob):
             )
 
         if pods:
-            await send_signal_to_pods(self.core_api_ws, self.namespace, pods, "SIGUSR1")
+            await send_signal_to_pods(self.core_api_ws, self.namespace, pods, "SIGUSR2")
 
         crawl.spec.replicas = new_scale
 
diff --git a/backend/btrixcloud/k8s/templates/crawler.yaml b/backend/btrixcloud/k8s/templates/crawler.yaml
index 9884f7bb..398ae0d0 100644
--- a/backend/btrixcloud/k8s/templates/crawler.yaml
+++ b/backend/btrixcloud/k8s/templates/crawler.yaml
@@ -20,6 +20,11 @@ spec:
   serviceName: redis-{{ id }}
   replicas: 1
   podManagementPolicy: Parallel
+
+  persistentVolumeClaimRetentionPolicy:
+    whenDeleted: Delete
+    whenScaled: Delete
+
   volumeClaimTemplates:
     - metadata:
         name: redis-data
@@ -28,9 +33,6 @@ spec:
           role: crawler
 
       spec:
-        persistentVolumeClaimRetentionPolicy:
-          whenDeleted: Deleted
-          whenScaled: Delete
         accessModes:
           - ReadWriteOnce
 
@@ -186,6 +188,11 @@ spec:
   serviceName: crawl-{{ id }}
   replicas: {{ scale }}
   podManagementPolicy: Parallel
+
+  persistentVolumeClaimRetentionPolicy:
+    whenDeleted: Delete
+    whenScaled: Delete
+
   volumeClaimTemplates:
     - metadata:
         name: crawl-data
@@ -194,9 +201,6 @@ spec:
           role: crawler
 
       spec:
-        persistentVolumeClaimRetentionPolicy:
-          whenDeleted: Deleted
-          whenScaled: Delete
         accessModes:
           - ReadWriteOnce
 
diff --git a/backend/btrixcloud/swarm/crawl_job.py b/backend/btrixcloud/swarm/crawl_job.py
index e4b69623..4f7d0a0a 100644
--- a/backend/btrixcloud/swarm/crawl_job.py
+++ b/backend/btrixcloud/swarm/crawl_job.py
@@ -29,7 +29,7 @@ class SwarmCrawlJob(SwarmJobMixin, CrawlJob):
                 num = num - 1
                 service_id = f"crawl-{self.job_id}-{num}_crawler"
                 await loop.run_in_executor(
-                    None, runner.ping_containers, service_id, "SIGUSR1"
+                    None, runner.ping_containers, service_id, "SIGUSR2"
                 )
 
             # delete