Yaniv Bronhaim has uploaded a new change for review.
Change subject: engine: ManageDomainsResult prints null when setConfigValue
fails (#818479)
......................................................................
engine: ManageDomainsResult prints null when setConfigValue fails
(#818479)
1. In ConfigurationProvider we thorw ManageDomainsResult with list
of strings instead of sending all params to ctor. The ctor reads
those params and thinks that He gets only 1 param instead of 2.
The result is a print of default message instead of the formatted
message.
2. ManageDomainsResult didn't override getMessage method.
3. The output for ManageDomainsResult with no default message was
changed to include also enumResult message.
Change-Id: If5b7abde0edb700f42563f06160cd7278848ad0e
Signed-off-by: Yaniv Bronhaim <ybron...@redhat.com>
---
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ConfigurationProvider.java
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ManageDomainsResult.java
2 files changed, 15 insertions(+), 9 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/27/7627/1
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ConfigurationProvider.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ConfigurationProvider.java
index 435a1d1..d33958d 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ConfigurationProvider.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ConfigurationProvider.java
@@ -95,19 +95,21 @@
try {
passFile = createPassFile(entry.getDomainsConfigurationEntry());
- Process engineConfigProcess =
- Runtime.getRuntime().exec(engineConfigExecutable + " -s "
- + enumValue.name() + ((passedAsValue) ? "=" +
entry.getDomainsConfigurationEntry() :
- " --admin-pass-file " +
passFile.getAbsolutePath())
- + " -p " + engineConfigProperties);
+ String executeCmd =
+ Process engineConfigProcess = engineConfigExecutable + " -s "
+ + enumValue.name() + ((passedAsValue) ? "=" +
entry.getDomainsConfigurationEntry() :
+ " --admin-pass-file " + passFile.getAbsolutePath())
+ + " -p " + engineConfigProperties;
+ Runtime.getRuntime().exec();
+
int retVal = engineConfigProcess.waitFor();
if (retVal != 0) {
throw new
ManageDomainsResult(ManageDomainsResultEnum.FAILED_SETTING_CONFIGURATION_VALUE_FOR_OPTION,
- enumValue.name());
+ enumValue.name() + " - execute command: " +
executeCmd);
}
} catch (Throwable e) {
throw new
ManageDomainsResult(ManageDomainsResultEnum.FAILED_SETTING_CONFIGURATION_VALUE_FOR_OPTION_WITH_DETAILS,
- new String[] { enumValue.name(), e.getMessage() });
+ enumValue.name(), e.getMessage());
} finally {
disposePassFile(passFile);
}
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ManageDomainsResult.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ManageDomainsResult.java
index cca6062..0673718 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ManageDomainsResult.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/kerberos/ManageDomainsResult.java
@@ -63,8 +63,8 @@
}
else {
if (StringUtils.isEmpty(defaultMsg)) {
- log.debug("No default param passed.");
- this.detailedMessage = "Error with output, no default message
to show. sorry..";
+ this.detailedMessage = enumResult.getDetailedMessage() +
+ ": One of the parameters for this error is null and no
default message to show";
}
else {
this.detailedMessage = defaultMsg;
@@ -88,6 +88,10 @@
return detailedMessage;
}
+ public String getMessage() {
+ return detailedMessage;
+ }
+
public void setDetailedMessage(String detailedMessage) {
this.detailedMessage = detailedMessage;
}
--
To view, visit http://gerrit.ovirt.org/7627
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If5b7abde0edb700f42563f06160cd7278848ad0e
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybron...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
