Skip to content

HBASE-25611 ExportSnapshot chmod flag uses value as decimal #3003

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 2, 2021
Merged

HBASE-25611 ExportSnapshot chmod flag uses value as decimal #3003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions hbase-common/src/main/java/org/apache/hadoop/hbase/util/AbstractHBaseTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,16 +233,24 @@ protected void addOptWithArg(String shortOpt, String longOpt, String description
}

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;
}
Expand Down
2 changes: 1 addition & 1 deletion hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/snapshot/ExportSnapshot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -927,7 +927,7 @@ protected void processOptions(CommandLine cmd) {
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(...).
Expand Down