You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2014/02/14 17:09:11 UTC
git commit: AMBARI-4676. Pass request properties to PASSIVE custom
action (ncole)
Updated Branches:
refs/heads/trunk c337d7df1 -> 6a1f1bfd4
AMBARI-4676. Pass request properties to PASSIVE custom action (ncole)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6a1f1bfd
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6a1f1bfd
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6a1f1bfd
Branch: refs/heads/trunk
Commit: 6a1f1bfd427b6784a4c4fa06b7d240140d27472e
Parents: c337d7d
Author: Nate Cole <nc...@hortonworks.com>
Authored: Fri Feb 14 09:51:05 2014 -0500
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Fri Feb 14 11:08:41 2014 -0500
----------------------------------------------------------------------
.../AmbariManagementControllerImpl.java | 3 ++-
.../server/controller/PassiveStateHelper.java | 7 ++-----
.../controller/internal/HostResourceProvider.java | 10 ++++++----
.../internal/ServiceResourceProvider.java | 2 +-
.../AmbariManagementControllerTest.java | 6 ++++--
.../server/controller/PassiveStateHelperTest.java | 18 ++++++++++++------
.../internal/HostResourceProviderTest.java | 5 +++--
7 files changed, 30 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6a1f1bfd/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
index c973dfc..d607eb4 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
@@ -1538,7 +1538,8 @@ public class AmbariManagementControllerImpl implements
} else {
sch.setPassiveState(newPassive);
try {
- PassiveStateHelper.createRequest(this, sch.getClusterName(), sch.getServiceComponentName());
+ PassiveStateHelper.createRequest(this, sch.getClusterName(),
+ requestProperties);
} catch (AmbariException e) {
LOG.warn("Could not send passive status to Nagios (" + e.getMessage() + ")");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/6a1f1bfd/ambari-server/src/main/java/org/apache/ambari/server/controller/PassiveStateHelper.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/PassiveStateHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/PassiveStateHelper.java
index eafa5e4..4d412f7 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/PassiveStateHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/PassiveStateHelper.java
@@ -120,7 +120,7 @@ public class PassiveStateHelper {
}
public static RequestStatusResponse createRequest(AmbariManagementController amc,
- String clusterName, String desc) throws AmbariException {
+ String clusterName, Map<String, String> requestProperties) throws AmbariException {
Map<String, String> params = new HashMap<String, String>();
@@ -128,10 +128,7 @@ public class PassiveStateHelper {
clusterName, RoleCommand.ACTIONEXECUTE.name(),
NAGIOS_ACTION_NAME, NAGIOS_SERVICE, NAGIOS_COMPONENT, null, params);
- Map<String, String> map = new HashMap<String, String>();
- map.put("context", "Update " + desc + " passive state");
-
- return amc.createAction(actionRequest, map);
+ return amc.createAction(actionRequest, requestProperties);
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/6a1f1bfd/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
index df9763a..01163b7 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
@@ -241,7 +241,7 @@ public class HostResourceProvider extends AbstractControllerResourceProvider {
}
@Override
- public RequestStatus updateResources(Request request, Predicate predicate)
+ public RequestStatus updateResources(final Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
final Set<HostRequest> requests = new HashSet<HostRequest>();
@@ -252,7 +252,7 @@ public class HostResourceProvider extends AbstractControllerResourceProvider {
modifyResources(new Command<Void>() {
@Override
public Void invoke() throws AmbariException {
- updateHosts(requests);
+ updateHosts(requests, request.getRequestInfoProperties());
return null;
}
});
@@ -518,7 +518,8 @@ public class HostResourceProvider extends AbstractControllerResourceProvider {
return response;
}
- protected synchronized void updateHosts(Set<HostRequest> requests)
+ protected synchronized void updateHosts(Set<HostRequest> requests,
+ Map<String, String> requestProperties)
throws AmbariException {
if (requests.isEmpty()) {
@@ -576,7 +577,8 @@ public class HostResourceProvider extends AbstractControllerResourceProvider {
} else {
h.setPassiveState(c.getClusterId(), newState);
try {
- PassiveStateHelper.createRequest(controller, c.getClusterName(), h.getHostName());
+ PassiveStateHelper.createRequest(controller, c.getClusterName(),
+ requestProperties);
} catch (Exception e) {
LOG.warn("Could not send passive status to Nagios (" + e.getMessage() + ")");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/6a1f1bfd/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
index 1770d69..9cbd16f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
@@ -562,7 +562,7 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider
s.setPassiveState(newPassive);
try {
PassiveStateHelper.createRequest(controller, cluster.getClusterName(),
- s.getName());
+ requestProperties);
} catch (Exception e) {
LOG.warn("Could not send passive status to Nagios (" + e.getMessage() + ")");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/6a1f1bfd/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
index 9ecb127..2a1cf20 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
@@ -9220,7 +9220,8 @@ public class AmbariManagementControllerTest {
// passivate a host
HostRequest hr = new HostRequest(host1, clusterName, requestProperties);
hr.setPassiveState(PassiveState.PASSIVE.name());
- HostResourceProviderTest.updateHosts(controller, Collections.singleton(hr));
+ HostResourceProviderTest.updateHosts(controller, Collections.singleton(hr),
+ new HashMap<String, String>());
Host host = hosts.get(host1);
Assert.assertEquals(PassiveState.PASSIVE, host.getPassiveState(cluster.getClusterId()));
@@ -9240,7 +9241,8 @@ public class AmbariManagementControllerTest {
// reset
hr.setPassiveState(PassiveState.ACTIVE.name());
- HostResourceProviderTest.updateHosts(controller, Collections.singleton(hr));
+ HostResourceProviderTest.updateHosts(controller, Collections.singleton(hr),
+ new HashMap<String, String>());
host = hosts.get(host1);
Assert.assertEquals(PassiveState.ACTIVE, host.getPassiveState(cluster.getClusterId()));
http://git-wip-us.apache.org/repos/asf/ambari/blob/6a1f1bfd/ambari-server/src/test/java/org/apache/ambari/server/controller/PassiveStateHelperTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/PassiveStateHelperTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/PassiveStateHelperTest.java
index c63169b..8b4ad30 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/PassiveStateHelperTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/PassiveStateHelperTest.java
@@ -78,10 +78,12 @@ public class PassiveStateHelperTest {
replay(amc, cluster, sch);
- PassiveStateHelper.createRequest(amc, sch.getClusterName(), sch.getServiceComponentName());
+ Map<String, String> map = new HashMap<String, String>();
+ map.put("context", "abc");
+ PassiveStateHelper.createRequest(amc, sch.getClusterName(), map);
ExecuteActionRequest ear = earCapture.getValue();
- Map<String, String> map = rpCapture.getValue();
+ map = rpCapture.getValue();
Assert.assertEquals("nagios_update_ignore", ear.getActionName());
Assert.assertEquals("ACTIONEXECUTE", ear.getCommandName());
@@ -127,10 +129,12 @@ public class PassiveStateHelperTest {
replay(amc, cluster, service, sch1, host);
- PassiveStateHelper.createRequest(amc, cluster.getClusterName(), host.getHostName());
+ Map<String, String> map = new HashMap<String, String>();
+ map.put("context", "abc");
+ PassiveStateHelper.createRequest(amc, cluster.getClusterName(), map);
ExecuteActionRequest ear = earCapture.getValue();
- Map<String, String> map = rpCapture.getValue();
+ rpCapture.getValue();
Assert.assertEquals("nagios_update_ignore", ear.getActionName());
Assert.assertEquals("ACTIONEXECUTE", ear.getCommandName());
@@ -176,10 +180,12 @@ public class PassiveStateHelperTest {
replay(amc, cluster, service, sc1, sc2, sch1);
- PassiveStateHelper.createRequest(amc, "c1", service.getName());
+ Map<String, String> map = new HashMap<String, String>();
+ map.put("context", "abc");
+ PassiveStateHelper.createRequest(amc, "c1", map);
ExecuteActionRequest ear = earCapture.getValue();
- Map<String, String> map = rpCapture.getValue();
+ map = rpCapture.getValue();
Assert.assertEquals("nagios_update_ignore", ear.getActionName());
Assert.assertEquals("ACTIONEXECUTE", ear.getCommandName());
http://git-wip-us.apache.org/repos/asf/ambari/blob/6a1f1bfd/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java
index 951c4ad..049af58 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java
@@ -1143,10 +1143,11 @@ public class HostResourceProviderTest {
provider.deleteHosts(requests);
}
- public static void updateHosts(AmbariManagementController controller, Set<HostRequest> requests)
+ public static void updateHosts(AmbariManagementController controller, Set<HostRequest> requests,
+ Map<String, String> requestProperties)
throws AmbariException {
HostResourceProvider provider = getHostProvider(controller);
- provider.updateHosts(requests);
+ provider.updateHosts(requests, requestProperties);
}
}