Skip to content

Commit c1cc846

Browse files
committed
HBASE-25611 ExportSnapshot chmod flag uses value as decimal (#3003)
Signed-off-by: Wellington Chevreuil <wchevreuil@apache.org>
1 parent cb40b81 commit c1cc846

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

hbase-common/src/main/java/org/apache/hadoop/hbase/util/AbstractHBaseTool.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,16 +234,24 @@ protected void addOptWithArg(String shortOpt, String longOpt, String description
234234
}
235235

236236
public int getOptionAsInt(CommandLine cmd, String opt, int defaultValue) {
237+
return getOptionAsInt(cmd, opt, defaultValue, 10);
238+
}
239+
240+
public int getOptionAsInt(CommandLine cmd, String opt, int defaultValue, int radix) {
237241
if (cmd.hasOption(opt)) {
238-
return Integer.parseInt(cmd.getOptionValue(opt));
242+
return Integer.parseInt(cmd.getOptionValue(opt), radix);
239243
} else {
240244
return defaultValue;
241245
}
242246
}
243247

244248
public long getOptionAsLong(CommandLine cmd, String opt, int defaultValue) {
249+
return getOptionAsLong(cmd, opt, defaultValue, 10);
250+
}
251+
252+
public long getOptionAsLong(CommandLine cmd, String opt, int defaultValue, int radix) {
245253
if (cmd.hasOption(opt)) {
246-
return Long.parseLong(cmd.getOptionValue(opt));
254+
return Long.parseLong(cmd.getOptionValue(opt), radix);
247255
} else {
248256
return defaultValue;
249257
}

hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -927,7 +927,7 @@ protected void processOptions(CommandLine cmd) {
927927
mappers = getOptionAsInt(cmd, Options.MAPPERS.getLongOpt(), mappers);
928928
filesUser = cmd.getOptionValue(Options.CHUSER.getLongOpt(), filesUser);
929929
filesGroup = cmd.getOptionValue(Options.CHGROUP.getLongOpt(), filesGroup);
930-
filesMode = getOptionAsInt(cmd, Options.CHMOD.getLongOpt(), filesMode);
930+
filesMode = getOptionAsInt(cmd, Options.CHMOD.getLongOpt(), filesMode, 8);
931931
bandwidthMB = getOptionAsInt(cmd, Options.BANDWIDTH.getLongOpt(), bandwidthMB);
932932
overwrite = cmd.hasOption(Options.OVERWRITE.getLongOpt());
933933
// And verifyChecksum and verifyTarget with values read from old args in processOldArgs(...).

0 commit comments

Comments
 (0)