You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ps...@apache.org on 2021/03/02 10:51:23 UTC
[hbase] branch branch-2.3 updated: HBASE-25611 ExportSnapshot chmod
flag uses value as decimal (#3003)
This is an automated email from the ASF dual-hosted git repository.
psomogyi pushed a commit to branch branch-2.3
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.3 by this push:
new 30ba8b0 HBASE-25611 ExportSnapshot chmod flag uses value as decimal (#3003)
30ba8b0 is described below
commit 30ba8b055b6f72e220fc46b275b76f27b9fe769f
Author: Peter Somogyi <ps...@apache.org>
AuthorDate: Tue Mar 2 11:23:10 2021 +0100
HBASE-25611 ExportSnapshot chmod flag uses value as decimal (#3003)
Signed-off-by: Wellington Chevreuil <wc...@apache.org>
---
.../java/org/apache/hadoop/hbase/util/AbstractHBaseTool.java | 12 ++++++++++--
.../org/apache/hadoop/hbase/snapshot/ExportSnapshot.java | 2 +-
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/AbstractHBaseTool.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/AbstractHBaseTool.java
index b0a1ca6..0e1f710 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/AbstractHBaseTool.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/AbstractHBaseTool.java
@@ -234,16 +234,24 @@ public abstract class AbstractHBaseTool implements Tool {
}
public int getOptionAsInt(CommandLine cmd, String opt, int defaultValue) {
+ return getOptionAsInt(cmd, opt, defaultValue, 10);
+ }
+
+ public int getOptionAsInt(CommandLine cmd, String opt, int defaultValue, int radix) {
if (cmd.hasOption(opt)) {
- return Integer.parseInt(cmd.getOptionValue(opt));
+ return Integer.parseInt(cmd.getOptionValue(opt), radix);
} else {
return defaultValue;
}
}
public long getOptionAsLong(CommandLine cmd, String opt, int defaultValue) {
+ return getOptionAsLong(cmd, opt, defaultValue, 10);
+ }
+
+ public long getOptionAsLong(CommandLine cmd, String opt, int defaultValue, int radix) {
if (cmd.hasOption(opt)) {
- return Long.parseLong(cmd.getOptionValue(opt));
+ return Long.parseLong(cmd.getOptionValue(opt), radix);
} else {
return defaultValue;
}
diff --git a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java
index c215243..a95a9f4 100644
--- a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java
+++ b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java
@@ -927,7 +927,7 @@ public class ExportSnapshot extends AbstractHBaseTool implements Tool {
mappers = getOptionAsInt(cmd, Options.MAPPERS.getLongOpt(), mappers);
filesUser = cmd.getOptionValue(Options.CHUSER.getLongOpt(), filesUser);
filesGroup = cmd.getOptionValue(Options.CHGROUP.getLongOpt(), filesGroup);
- filesMode = getOptionAsInt(cmd, Options.CHMOD.getLongOpt(), filesMode);
+ filesMode = getOptionAsInt(cmd, Options.CHMOD.getLongOpt(), filesMode, 8);
bandwidthMB = getOptionAsInt(cmd, Options.BANDWIDTH.getLongOpt(), bandwidthMB);
overwrite = cmd.hasOption(Options.OVERWRITE.getLongOpt());
// And verifyChecksum and verifyTarget with values read from old args in processOldArgs(...).