From f9bc2660f6dc67db61cacf52541856557b05c8fa Mon Sep 17 00:00:00 2001 From: Robin Han Date: Sat, 25 Nov 2023 22:24:02 +0800 Subject: [PATCH] fix(s3stream): update to 0.5.6 and fix serveless cmd (#730) Signed-off-by: Robin Han --- pom.xml | 2 +- s3stream/pom.xml | 2 +- .../com/automq/stream/s3/failover/DefaultServerless.java | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 225b9fa9b..c382e9610 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,7 @@ 32.0.1-jre 2.0.9 2.2 - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT 23.5.26 diff --git a/s3stream/pom.xml b/s3stream/pom.xml index 77b2d436e..0e414cec3 100644 --- a/s3stream/pom.xml +++ b/s3stream/pom.xml @@ -22,7 +22,7 @@ 4.0.0 com.automq.elasticstream s3stream - 0.5.5-SNAPSHOT + 0.5.6-SNAPSHOT 5.5.0 5.10.0 diff --git a/s3stream/src/main/java/com/automq/stream/s3/failover/DefaultServerless.java b/s3stream/src/main/java/com/automq/stream/s3/failover/DefaultServerless.java index c49d2ae4e..e6b88d31e 100644 --- a/s3stream/src/main/java/com/automq/stream/s3/failover/DefaultServerless.java +++ b/s3stream/src/main/java/com/automq/stream/s3/failover/DefaultServerless.java @@ -33,7 +33,7 @@ public class DefaultServerless implements Serverless { @Override public String attach(String volumeId, int nodeId) throws ExecutionException { String[] cmd = new String[]{SERVERLESS_CMD, "volume", "attach", "-v", volumeId, "-n", Integer.toString(nodeId)}; - CommandResult result = CommandUtils.run(); + CommandResult result = CommandUtils.run(cmd); check(cmd, result); return jsonParse(result.stdout(), AttachResult.class).getDeviceName(); } @@ -41,21 +41,21 @@ public String attach(String volumeId, int nodeId) throws ExecutionException { @Override public void delete(String volumeId) throws ExecutionException { String[] cmd = new String[]{SERVERLESS_CMD, "volume", "delete", "-v", volumeId}; - CommandResult result = CommandUtils.run(); + CommandResult result = CommandUtils.run(cmd); check(cmd, result); } @Override public void fence(String volumeId) throws ExecutionException { String[] cmd = new String[]{SERVERLESS_CMD, "volume", "fence", "-v", volumeId}; - CommandResult result = CommandUtils.run(); + CommandResult result = CommandUtils.run(cmd); check(cmd, result); } @Override public List scan() throws ExecutionException { String[] cmd = new String[]{SERVERLESS_CMD, "volume", "query"}; - CommandResult result = CommandUtils.run(); + CommandResult result = CommandUtils.run(cmd); check(cmd, result); QueryFailedNode[] nodes = jsonParse(result.stdout(), QueryFailedNode[].class); return Arrays.stream(nodes).map(n -> {