From e8263bc987d890060050b7e31fbc3ab573bd45a7 Mon Sep 17 00:00:00 2001
From: Yoni Nakache <45972051+LazyDBA247-Anyvision@users.noreply.github.com>
Date: Sun, 7 Mar 2021 16:38:05 +0200
Subject: [PATCH 01/21] new weed shell command

all s3 commands have now s3. prefix
---
 automation/devops_automation_infra/plugins/seaweed.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/automation/devops_automation_infra/plugins/seaweed.py b/automation/devops_automation_infra/plugins/seaweed.py
index ec7d4861..3bbf86a4 100644
--- a/automation/devops_automation_infra/plugins/seaweed.py
+++ b/automation/devops_automation_infra/plugins/seaweed.py
@@ -65,15 +65,15 @@ def reset_state(self, keys={}):
                     self.delete_bucket(bucket.name)
 
     def clear_buckets(self):
-        weed_shell = "weed shell -filer seaweedfs-filer:8888"
+        weed_shell = "weed shell "
 
         def weed_cmd(cmd):
             return " | ".join([f"echo {cmd}", weed_shell])
 
         weed_delete_cmd = " | ".join([
-            weed_cmd("bucket.list"),
+            weed_cmd("s3.bucket.list"),
             "grep -Eo '\\S+$'",
-            "sed 's|^|bucket.delete -name |'",
+            "sed 's|^|s3.bucket.delete -name |'",
             "tr '\\n' ';'",
             weed_shell
         ])

From 6c96ec653509511465b550f76e4d1b4f4d4bce96 Mon Sep 17 00:00:00 2001
From: Yoni Nakache <45972051+LazyDBA247-Anyvision@users.noreply.github.com>
Date: Sun, 7 Mar 2021 17:24:13 +0200
Subject: [PATCH 02/21] fix grep to sed to remove prefix whitespaces

---
 automation/devops_automation_infra/plugins/seaweed.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/automation/devops_automation_infra/plugins/seaweed.py b/automation/devops_automation_infra/plugins/seaweed.py
index 3bbf86a4..a1401322 100644
--- a/automation/devops_automation_infra/plugins/seaweed.py
+++ b/automation/devops_automation_infra/plugins/seaweed.py
@@ -72,8 +72,8 @@ def weed_cmd(cmd):
 
         weed_delete_cmd = " | ".join([
             weed_cmd("s3.bucket.list"),
-            "grep -Eo '\\S+$'",
-            "sed 's|^|s3.bucket.delete -name |'",
+            "sed 's/^ *//'",
+            "sed 's|^|s3.bucket.delete -name=|'",
             "tr '\\n' ';'",
             weed_shell
         ])

From ee5757a397a00e627dd50f50acd5ddf517a25a4e Mon Sep 17 00:00:00 2001
From: Yoni Nakache <45972051+LazyDBA247-Anyvision@users.noreply.github.com>
Date: Sun, 7 Mar 2021 17:36:53 +0200
Subject: [PATCH 03/21] add logging to command

---
 automation/devops_automation_infra/plugins/seaweed.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/automation/devops_automation_infra/plugins/seaweed.py b/automation/devops_automation_infra/plugins/seaweed.py
index a1401322..80f04556 100644
--- a/automation/devops_automation_infra/plugins/seaweed.py
+++ b/automation/devops_automation_infra/plugins/seaweed.py
@@ -83,7 +83,8 @@ def weed_cmd(cmd):
             weed_delete_cmd,
             weed_cmd("unlock")
         ])
-
+        
+        logging.info(f"weed_delete_cmd: {weed_delete_cmd}")
         self._host.Docker.run_cmd_in_service('_seaweedfs-master_', weed_delete_cmd)
 
     def verify_functionality(self):

From fd7231545742934aa82d1aa21d287f08df198965 Mon Sep 17 00:00:00 2001
From: Yoni Nakache <45972051+LazyDBA247-Anyvision@users.noreply.github.com>
Date: Sun, 7 Mar 2021 17:45:11 +0200
Subject: [PATCH 04/21] skip header

weed shell, now output header info
---
 automation/devops_automation_infra/plugins/seaweed.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/automation/devops_automation_infra/plugins/seaweed.py b/automation/devops_automation_infra/plugins/seaweed.py
index 80f04556..30d09f05 100644
--- a/automation/devops_automation_infra/plugins/seaweed.py
+++ b/automation/devops_automation_infra/plugins/seaweed.py
@@ -72,6 +72,7 @@ def weed_cmd(cmd):
 
         weed_delete_cmd = " | ".join([
             weed_cmd("s3.bucket.list"),
+            "tail -n +1",
             "sed 's/^ *//'",
             "sed 's|^|s3.bucket.delete -name=|'",
             "tr '\\n' ';'",
@@ -84,7 +85,7 @@ def weed_cmd(cmd):
             weed_cmd("unlock")
         ])
         
-        logging.info(f"weed_delete_cmd: {weed_delete_cmd}")
+        logging.debug(f"weed_delete_cmd: {weed_delete_cmd}")
         self._host.Docker.run_cmd_in_service('_seaweedfs-master_', weed_delete_cmd)
 
     def verify_functionality(self):

From 977e2309dcf574e8d075d8fb9be77fe836518a63 Mon Sep 17 00:00:00 2001
From: Yoni Nakache <45972051+LazyDBA247-Anyvision@users.noreply.github.com>
Date: Sun, 7 Mar 2021 17:52:42 +0200
Subject: [PATCH 05/21] remove lines with seaweedfs-master + '>'

---
 automation/devops_automation_infra/plugins/seaweed.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/automation/devops_automation_infra/plugins/seaweed.py b/automation/devops_automation_infra/plugins/seaweed.py
index 30d09f05..90e7d903 100644
--- a/automation/devops_automation_infra/plugins/seaweed.py
+++ b/automation/devops_automation_infra/plugins/seaweed.py
@@ -72,7 +72,7 @@ def weed_cmd(cmd):
 
         weed_delete_cmd = " | ".join([
             weed_cmd("s3.bucket.list"),
-            "tail -n +1",
+            "grep -v 'seaweedfs-master:9333' | tr -d '>'",
             "sed 's/^ *//'",
             "sed 's|^|s3.bucket.delete -name=|'",
             "tr '\\n' ';'",

From d784a422f43241222e8562b74a1d5e894450dbca Mon Sep 17 00:00:00 2001
From: Yoni Nakache <45972051+LazyDBA247-Anyvision@users.noreply.github.com>
Date: Sun, 7 Mar 2021 18:11:27 +0200
Subject: [PATCH 06/21] using execute on every row, and cleaning empty rows

---
 automation/devops_automation_infra/plugins/seaweed.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/automation/devops_automation_infra/plugins/seaweed.py b/automation/devops_automation_infra/plugins/seaweed.py
index 90e7d903..b2920357 100644
--- a/automation/devops_automation_infra/plugins/seaweed.py
+++ b/automation/devops_automation_infra/plugins/seaweed.py
@@ -72,11 +72,12 @@ def weed_cmd(cmd):
 
         weed_delete_cmd = " | ".join([
             weed_cmd("s3.bucket.list"),
-            "grep -v 'seaweedfs-master:9333' | tr -d '>'",
+            "grep -v 'seaweedfs-master:9333'",
+            "tr -d '>'",
+            "sed '/^[[:space:]]*$/d'",
             "sed 's/^ *//'",
-            "sed 's|^|s3.bucket.delete -name=|'",
-            "tr '\\n' ';'",
-            weed_shell
+            "xargs -I{} echo 's3.bucket.delete' -name={}",
+            "weed shell"
         ])
 
         weed_delete_cmd = "; ".join([

From 4c44abe092b071c4c05aa09905055fefcc0f3991 Mon Sep 17 00:00:00 2001
From: Yoni Nakache <45972051+LazyDBA247-Anyvision@users.noreply.github.com>
Date: Sun, 7 Mar 2021 18:20:37 +0200
Subject: [PATCH 07/21] print command

---
 automation/devops_automation_infra/plugins/seaweed.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/automation/devops_automation_infra/plugins/seaweed.py b/automation/devops_automation_infra/plugins/seaweed.py
index b2920357..d447eb56 100644
--- a/automation/devops_automation_infra/plugins/seaweed.py
+++ b/automation/devops_automation_infra/plugins/seaweed.py
@@ -77,7 +77,7 @@ def weed_cmd(cmd):
             "sed '/^[[:space:]]*$/d'",
             "sed 's/^ *//'",
             "xargs -I{} echo 's3.bucket.delete' -name={}",
-            "weed shell"
+            weed_shell
         ])
 
         weed_delete_cmd = "; ".join([
@@ -86,7 +86,7 @@ def weed_cmd(cmd):
             weed_cmd("unlock")
         ])
         
-        logging.debug(f"weed_delete_cmd: {weed_delete_cmd}")
+        logging.info(f"weed_delete_cmd: {weed_delete_cmd}")
         self._host.Docker.run_cmd_in_service('_seaweedfs-master_', weed_delete_cmd)
 
     def verify_functionality(self):

From 4724e08359e443630a5fe55981a0d1b9ea958b6f Mon Sep 17 00:00:00 2001
From: Yoni Nakache <45972051+LazyDBA247-Anyvision@users.noreply.github.com>
Date: Sun, 7 Mar 2021 18:29:16 +0200
Subject: [PATCH 08/21] stop sending unlock on every bucket

---
 automation/devops_automation_infra/plugins/seaweed.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/automation/devops_automation_infra/plugins/seaweed.py b/automation/devops_automation_infra/plugins/seaweed.py
index d447eb56..7b050cff 100644
--- a/automation/devops_automation_infra/plugins/seaweed.py
+++ b/automation/devops_automation_infra/plugins/seaweed.py
@@ -76,8 +76,8 @@ def weed_cmd(cmd):
             "tr -d '>'",
             "sed '/^[[:space:]]*$/d'",
             "sed 's/^ *//'",
-            "xargs -I{} echo 's3.bucket.delete' -name={}",
-            weed_shell
+            "xargs -I{} echo 's3.bucket.delete' -name={} | weed shell",
+            "ehco 'done'"
         ])
 
         weed_delete_cmd = "; ".join([

From c5524deeff815dc045717a920401acb5d5c4a0bf Mon Sep 17 00:00:00 2001
From: Yoni Nakache <45972051+LazyDBA247-Anyvision@users.noreply.github.com>
Date: Sun, 7 Mar 2021 18:40:51 +0200
Subject: [PATCH 09/21] use lock/unlock + -e to execute enter in shell

---
 .../devops_automation_infra/plugins/seaweed.py       | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/automation/devops_automation_infra/plugins/seaweed.py b/automation/devops_automation_infra/plugins/seaweed.py
index 7b050cff..9ffd35c6 100644
--- a/automation/devops_automation_infra/plugins/seaweed.py
+++ b/automation/devops_automation_infra/plugins/seaweed.py
@@ -76,16 +76,10 @@ def weed_cmd(cmd):
             "tr -d '>'",
             "sed '/^[[:space:]]*$/d'",
             "sed 's/^ *//'",
-            "xargs -I{} echo 's3.bucket.delete' -name={} | weed shell",
-            "ehco 'done'"
+            "xargs -I{} echo -e 'lock\n;s3.bucket.delete' -name={};\nunlock\n'",
+            weed_shell
         ])
-
-        weed_delete_cmd = "; ".join([
-            weed_cmd("lock"),
-            weed_delete_cmd,
-            weed_cmd("unlock")
-        ])
-        
+       
         logging.info(f"weed_delete_cmd: {weed_delete_cmd}")
         self._host.Docker.run_cmd_in_service('_seaweedfs-master_', weed_delete_cmd)
 

From 1aeeed8b78c6de0b6ef7d5b4ce67ed1b49ed6810 Mon Sep 17 00:00:00 2001
From: Yoni Nakache <45972051+LazyDBA247-Anyvision@users.noreply.github.com>
Date: Sun, 7 Mar 2021 18:52:56 +0200
Subject: [PATCH 10/21] add escaping

---
 automation/devops_automation_infra/plugins/seaweed.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/automation/devops_automation_infra/plugins/seaweed.py b/automation/devops_automation_infra/plugins/seaweed.py
index 9ffd35c6..5946632f 100644
--- a/automation/devops_automation_infra/plugins/seaweed.py
+++ b/automation/devops_automation_infra/plugins/seaweed.py
@@ -76,7 +76,7 @@ def weed_cmd(cmd):
             "tr -d '>'",
             "sed '/^[[:space:]]*$/d'",
             "sed 's/^ *//'",
-            "xargs -I{} echo -e 'lock\n;s3.bucket.delete' -name={};\nunlock\n'",
+            "xargs -I{} echo -e 'lock\\n;s3.bucket.delete' -name={};\\nunlock\\n'",
             weed_shell
         ])
        

From 2826a7338a9beb92fae8f300519da3281bc8bf5c Mon Sep 17 00:00:00 2001
From: Yoni Nakache <45972051+LazyDBA247-Anyvision@users.noreply.github.com>
Date: Sun, 7 Mar 2021 19:06:25 +0200
Subject: [PATCH 11/21] remove bad qoute, stop using ';'

---
 automation/devops_automation_infra/plugins/seaweed.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/automation/devops_automation_infra/plugins/seaweed.py b/automation/devops_automation_infra/plugins/seaweed.py
index 5946632f..cc9a04e4 100644
--- a/automation/devops_automation_infra/plugins/seaweed.py
+++ b/automation/devops_automation_infra/plugins/seaweed.py
@@ -76,7 +76,7 @@ def weed_cmd(cmd):
             "tr -d '>'",
             "sed '/^[[:space:]]*$/d'",
             "sed 's/^ *//'",
-            "xargs -I{} echo -e 'lock\\n;s3.bucket.delete' -name={};\\nunlock\\n'",
+            "xargs -I{} echo -e 'lock\\ns3.bucket.delete -name={}\\nunlock\\n'",
             weed_shell
         ])
        

From 450603670977300bf48fcc002db9280a9ee8d640 Mon Sep 17 00:00:00 2001
From: Yoni Nakache <45972051+LazyDBA247-Anyvision@users.noreply.github.com>
Date: Sun, 7 Mar 2021 19:17:10 +0200
Subject: [PATCH 12/21] now with 50% chance of working :)

---
 automation/devops_automation_infra/plugins/seaweed.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/automation/devops_automation_infra/plugins/seaweed.py b/automation/devops_automation_infra/plugins/seaweed.py
index cc9a04e4..5469fb9c 100644
--- a/automation/devops_automation_infra/plugins/seaweed.py
+++ b/automation/devops_automation_infra/plugins/seaweed.py
@@ -76,7 +76,7 @@ def weed_cmd(cmd):
             "tr -d '>'",
             "sed '/^[[:space:]]*$/d'",
             "sed 's/^ *//'",
-            "xargs -I{} echo -e 'lock\\ns3.bucket.delete -name={}\\nunlock\\n'",
+            "xargs -I{} echo 'lock; s3.bucket.delete -name={}; unlock'",
             weed_shell
         ])
        

From 6a621e31883179840c5573a803ac1ee921102a29 Mon Sep 17 00:00:00 2001
From: Yoni Nakache <45972051+LazyDBA247-Anyvision@users.noreply.github.com>
Date: Sun, 7 Mar 2021 19:45:35 +0200
Subject: [PATCH 13/21] fix weed_cmd

---
 automation/devops_automation_infra/plugins/seaweed.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/automation/devops_automation_infra/plugins/seaweed.py b/automation/devops_automation_infra/plugins/seaweed.py
index 5469fb9c..042ab306 100644
--- a/automation/devops_automation_infra/plugins/seaweed.py
+++ b/automation/devops_automation_infra/plugins/seaweed.py
@@ -65,10 +65,10 @@ def reset_state(self, keys={}):
                     self.delete_bucket(bucket.name)
 
     def clear_buckets(self):
-        weed_shell = "weed shell "
+        weed_shell = "weed shell"
 
         def weed_cmd(cmd):
-            return " | ".join([f"echo {cmd}", weed_shell])
+            return " | ".join([f"echo '{cmd}'", weed_shell])
 
         weed_delete_cmd = " | ".join([
             weed_cmd("s3.bucket.list"),

From c656da1442fe18a54c74ae7a93e877f53146780a Mon Sep 17 00:00:00 2001
From: Yoni Nakache <45972051+LazyDBA247-Anyvision@users.noreply.github.com>
Date: Sun, 7 Mar 2021 20:11:04 +0200
Subject: [PATCH 14/21] print cmd

---
 automation/devops_automation_infra/plugins/docker.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/automation/devops_automation_infra/plugins/docker.py b/automation/devops_automation_infra/plugins/docker.py
index 07bb3c2e..90a0c483 100644
--- a/automation/devops_automation_infra/plugins/docker.py
+++ b/automation/devops_automation_infra/plugins/docker.py
@@ -114,6 +114,7 @@ def run_container_till_complete(self, servce_name, timeout=60):
     def run_cmd_in_service(self, service_name, cmd):
         cmd_escaped = cmd.replace("'", "\\'")
         cmd = self._running_container_by_name_cmd(service_name) + f"| xargs -I{{}} {self._docker_bin} exec {{}} sh -c $'{cmd_escaped}'"
+        logging.info(f"cmd: {cmd}")
         return self.try_executing_and_verbosely_log_error(cmd).strip()
 
     def run_cmd_in_service_background(self, service_name, cmd):

From 44bf863357e2e6ed4599d6646a05f9f80b76c4f0 Mon Sep 17 00:00:00 2001
From: Yoni Nakache <45972051+LazyDBA247-Anyvision@users.noreply.github.com>
Date: Sun, 7 Mar 2021 20:25:05 +0200
Subject: [PATCH 15/21] escape xargs

---
 automation/devops_automation_infra/plugins/seaweed.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/automation/devops_automation_infra/plugins/seaweed.py b/automation/devops_automation_infra/plugins/seaweed.py
index 042ab306..a4df7208 100644
--- a/automation/devops_automation_infra/plugins/seaweed.py
+++ b/automation/devops_automation_infra/plugins/seaweed.py
@@ -76,7 +76,7 @@ def weed_cmd(cmd):
             "tr -d '>'",
             "sed '/^[[:space:]]*$/d'",
             "sed 's/^ *//'",
-            "xargs -I{} echo 'lock; s3.bucket.delete -name={}; unlock'",
+            "xargs -I{{}} echo 'lock; s3.bucket.delete -name={}; unlock'",
             weed_shell
         ])
        

From b8ddd10c99f28f11021169d63abbf7a732c4d882 Mon Sep 17 00:00:00 2001
From: Yoni Nakache <45972051+LazyDBA247-Anyvision@users.noreply.github.com>
Date: Sun, 7 Mar 2021 20:33:08 +0200
Subject: [PATCH 16/21] escape both xargs params

---
 automation/devops_automation_infra/plugins/seaweed.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/automation/devops_automation_infra/plugins/seaweed.py b/automation/devops_automation_infra/plugins/seaweed.py
index a4df7208..edeb98d7 100644
--- a/automation/devops_automation_infra/plugins/seaweed.py
+++ b/automation/devops_automation_infra/plugins/seaweed.py
@@ -76,7 +76,7 @@ def weed_cmd(cmd):
             "tr -d '>'",
             "sed '/^[[:space:]]*$/d'",
             "sed 's/^ *//'",
-            "xargs -I{{}} echo 'lock; s3.bucket.delete -name={}; unlock'",
+            "xargs -I{{}} echo 'lock; s3.bucket.delete -name={{}}; unlock'",
             weed_shell
         ])
        

From ed3e1f579fe4cb4bfeb4332ec94cdea78ee68b3a Mon Sep 17 00:00:00 2001
From: Yoni Nakache <45972051+LazyDBA247-Anyvision@users.noreply.github.com>
Date: Sun, 7 Mar 2021 20:44:06 +0200
Subject: [PATCH 17/21] remove xargs

---
 automation/devops_automation_infra/plugins/seaweed.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/automation/devops_automation_infra/plugins/seaweed.py b/automation/devops_automation_infra/plugins/seaweed.py
index edeb98d7..3915d6d4 100644
--- a/automation/devops_automation_infra/plugins/seaweed.py
+++ b/automation/devops_automation_infra/plugins/seaweed.py
@@ -76,7 +76,9 @@ def weed_cmd(cmd):
             "tr -d '>'",
             "sed '/^[[:space:]]*$/d'",
             "sed 's/^ *//'",
-            "xargs -I{{}} echo 'lock; s3.bucket.delete -name={{}}; unlock'",
+            "sed 's|^|lock; bucket.delete -name=|'",
+            "tr '\\n' ';'",
+            "sed 's|$|unlock|'",
             weed_shell
         ])
        

From 27ee6a50e62f871fbf587553ff3ee97191b78a5b Mon Sep 17 00:00:00 2001
From: Yoni Nakache <45972051+LazyDBA247-Anyvision@users.noreply.github.com>
Date: Sun, 7 Mar 2021 20:50:01 +0200
Subject: [PATCH 18/21] correct s3.bucket.delete

---
 automation/devops_automation_infra/plugins/seaweed.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/automation/devops_automation_infra/plugins/seaweed.py b/automation/devops_automation_infra/plugins/seaweed.py
index 3915d6d4..a272c82e 100644
--- a/automation/devops_automation_infra/plugins/seaweed.py
+++ b/automation/devops_automation_infra/plugins/seaweed.py
@@ -76,7 +76,7 @@ def weed_cmd(cmd):
             "tr -d '>'",
             "sed '/^[[:space:]]*$/d'",
             "sed 's/^ *//'",
-            "sed 's|^|lock; bucket.delete -name=|'",
+            "sed 's|^|lock; s3.bucket.delete -name=|'",
             "tr '\\n' ';'",
             "sed 's|$|unlock|'",
             weed_shell

From eab2e06305508aa925b4616058cda92dfe83482e Mon Sep 17 00:00:00 2001
From: Yoni Nakache <45972051+LazyDBA247-Anyvision@users.noreply.github.com>
Date: Sun, 7 Mar 2021 21:04:50 +0200
Subject: [PATCH 19/21] one unlock to rule them all

---
 automation/devops_automation_infra/plugins/seaweed.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/automation/devops_automation_infra/plugins/seaweed.py b/automation/devops_automation_infra/plugins/seaweed.py
index a272c82e..19d44bb2 100644
--- a/automation/devops_automation_infra/plugins/seaweed.py
+++ b/automation/devops_automation_infra/plugins/seaweed.py
@@ -76,11 +76,16 @@ def weed_cmd(cmd):
             "tr -d '>'",
             "sed '/^[[:space:]]*$/d'",
             "sed 's/^ *//'",
-            "sed 's|^|lock; s3.bucket.delete -name=|'",
+            "sed 's|^|s3.bucket.delete -name=|'",
             "tr '\\n' ';'",
-            "sed 's|$|unlock|'",
             weed_shell
         ])
+        
+        weed_delete_cmd = "; ".join([
+            weed_cmd("lock"),
+            weed_delete_cmd,
+            weed_cmd("unlock")
+        ])
        
         logging.info(f"weed_delete_cmd: {weed_delete_cmd}")
         self._host.Docker.run_cmd_in_service('_seaweedfs-master_', weed_delete_cmd)

From 71c358f1766539454c4e93c47e49d4c2e8555a1e Mon Sep 17 00:00:00 2001
From: Yoni Nakache <45972051+LazyDBA247-Anyvision@users.noreply.github.com>
Date: Sun, 7 Mar 2021 23:52:52 +0200
Subject: [PATCH 20/21] oneliner

---
 automation/devops_automation_infra/plugins/seaweed.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/automation/devops_automation_infra/plugins/seaweed.py b/automation/devops_automation_infra/plugins/seaweed.py
index 19d44bb2..941fb6ae 100644
--- a/automation/devops_automation_infra/plugins/seaweed.py
+++ b/automation/devops_automation_infra/plugins/seaweed.py
@@ -78,15 +78,10 @@ def weed_cmd(cmd):
             "sed 's/^ *//'",
             "sed 's|^|s3.bucket.delete -name=|'",
             "tr '\\n' ';'",
+            "(echo 'lock'; cat -; echo 'unlock')",
             weed_shell
         ])
         
-        weed_delete_cmd = "; ".join([
-            weed_cmd("lock"),
-            weed_delete_cmd,
-            weed_cmd("unlock")
-        ])
-       
         logging.info(f"weed_delete_cmd: {weed_delete_cmd}")
         self._host.Docker.run_cmd_in_service('_seaweedfs-master_', weed_delete_cmd)
 

From 045016a043a56d3a61fc2a713be2be2ef3937459 Mon Sep 17 00:00:00 2001
From: Yoni Nakache <45972051+LazyDBA247-Anyvision@users.noreply.github.com>
Date: Mon, 8 Mar 2021 00:15:29 +0200
Subject: [PATCH 21/21] fix

---
 automation/devops_automation_infra/plugins/seaweed.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/automation/devops_automation_infra/plugins/seaweed.py b/automation/devops_automation_infra/plugins/seaweed.py
index 941fb6ae..d0faeb9d 100644
--- a/automation/devops_automation_infra/plugins/seaweed.py
+++ b/automation/devops_automation_infra/plugins/seaweed.py
@@ -78,12 +78,12 @@ def weed_cmd(cmd):
             "sed 's/^ *//'",
             "sed 's|^|s3.bucket.delete -name=|'",
             "tr '\\n' ';'",
-            "(echo 'lock'; cat -; echo 'unlock')",
+            "(echo 'lock;'; cat -; echo ''; echo 'unlock;')",
             weed_shell
         ])
         
         logging.info(f"weed_delete_cmd: {weed_delete_cmd}")
-        self._host.Docker.run_cmd_in_service('_seaweedfs-master_', weed_delete_cmd)
+        self._host.Docker.run_cmd_in_service('seaweedfs-master_', weed_delete_cmd)
 
     def verify_functionality(self):
         try: