fix scaling in

cas-packone · Sep 6, 2019 · d626ec6 · d626ec6
1 parent 56c95c0
commit d626ec6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/pk1/engines/signals.py b/pk1/engines/signals.py
@@ -89,16 +89,20 @@ def scale_in_cluster(sender,instance,**kwargs):
             if not cluster.steps.all().exists():
                 destroyed.send(sender=models.Cluster, instance=cluster, name='destroyed')
                 cluster.delete()
-        else:
+        elif instance.hosts:
             cluster.update_remedy_script(
                 utils.remedy_script_hosts_remove(instance.hosts),
                 heading=True
             )
-            if cluster.scale.remedy_script_scale_in:
-                cluster.update_remedy_script(
-                    cluster.scale.remedy_script_scale_in,
-                    heading=True
-                )
+            scale_in_script=''
+            for h in instance.hosts.split('\n'):
+                if h.startswith('#'): continue
+                scale_in_script+=cluster.scale.remedy_script_scale_in.format(hostname=h.split(' ')[-1])+'\n'
+            cluster.update_remedy_script(
+                scale_in_script,
+                heading=True
+            )
+            cluster.remedy()
 
 @receiver(monitored, sender=Group)
 @receiver(tidied, sender=models.ClusterOperation)

diff --git a/pk1/engines/utils.py b/pk1/engines/utils.py
@@ -47,4 +47,4 @@ def remedy_scale_ambari_fast_scale_out():
         'ambari master1:8080 service start'
 
 def remedy_scale_ambari_fast_scale_in():
-    return '#ambari master1:8080 host delete `hostname`'
+    return 'if [ `hostname` == "master1.packone" ]; then\nambari master1:8080 host delete {hostname}\nfi'