Skip to content

HDDS-4325. Incompatible return codes from Ozone getconf -confKey #1485

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
umamaheswararao merged 1 commit into from
Oct 8, 2020
Merged

HDDS-4325. Incompatible return codes from Ozone getconf -confKey #1485

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
37 changes: 25 additions & 12 deletions hadoop-ozone/dist/src/main/smoketest/basic/getconf.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,33 @@
# limitations under the License.

*** Settings ***
Documentation Smoketest ozone cluster startup
Library OperatingSystem
Resource ../commonlib.robot
Documentation Test 'ozone getconf' command
Resource ../lib/os.robot
Test Timeout 5 minutes

*** Test Cases ***
Ozone getconf OM
${result} = Execute ozone getconf ozonemanagers
Should contain ${result} om
Get OM
${result} = Execute ozone getconf ozonemanagers
Should contain ${result} om
${result} = Execute ozone getconf -ozonemanagers
Should contain ${result} om

Ozone getconf SCM
${result} = Execute ozone getconf storagecontainermanagers
Should contain ${result} scm
Get SCM
${result} = Execute ozone getconf storagecontainermanagers
Should contain ${result} scm
${result} = Execute ozone getconf -storagecontainermanagers
Should contain ${result} scm

Ozone getconf configration keys
${result} = Execute ozone getconf confKey endpoint.token
Should contain ${result} Configuration endpoint.token is missing
Get existing config key
${result} = Execute ozone getconf confKey ozone.om.address
Should contain ${result} om
Should not contain ${result} is missing
${result} = Execute ozone getconf -confKey ozone.om.address
Should contain ${result} om
Should not contain ${result} is missing

Get undefined config key
${result} = Execute and checkrc ozone getconf confKey no-such-config-key 255
Should contain ${result} Configuration no-such-config-key is missing
${result} = Execute and checkrc ozone getconf -confKey no-such-config-key 255
Should contain ${result} Configuration no-such-config-key is missing
3 changes: 2 additions & 1 deletion ...op-ozone/tools/src/main/java/org/apache/hadoop/ozone/conf/PrintConfKeyCommandHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ public Void call() throws Exception {
if (value != null) {
tool.printOut(value);
} else {
tool.printError("Configuration " + confKey + " is missing.");
throw new IllegalArgumentException(
"Configuration " + confKey + " is missing.");
}
return null;
}
Expand Down