You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2014/08/19 17:46:34 UTC
[9/9] git commit: AMBARI-6880 - Alerts: Send Definitions Down Via
Commands to the Agent (jonathanhurley)
AMBARI-6880 - Alerts: Send Definitions Down Via Commands to the Agent (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/68042051
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/68042051
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/68042051
Branch: refs/heads/branch-alerts-dev
Commit: 68042051bef22bb922029d85df03eccc38059c07
Parents: 8992245
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Fri Aug 15 14:27:27 2014 -0400
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Tue Aug 19 11:46:05 2014 -0400
----------------------------------------------------------------------
.../apache/ambari/server/agent/HeartBeatHandler.java | 4 ----
.../apache/ambari/server/agent/HeartBeatResponse.java | 12 ------------
.../apache/ambari/server/controller/AmbariServer.java | 1 -
.../internal/AlertDefinitionResourceProviderTest.java | 2 --
4 files changed, 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/68042051/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
index 3c16257..65b7b6f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java
@@ -224,10 +224,6 @@ public class HeartBeatHandler {
annotateResponse(hostname, response);
}
- // send the alert definition hash for this host
- Map<String, String> alertDefinitionHashes = alertDefinitionHash.getHashes(hostname);
- response.setAlertDefinitionHash(alertDefinitionHashes);
-
return response;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/68042051/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatResponse.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatResponse.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatResponse.java
index 98b0be0..1e9dc12 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatResponse.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatResponse.java
@@ -20,7 +20,6 @@ package org.apache.ambari.server.agent;
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
import com.google.gson.annotations.SerializedName;
@@ -138,16 +137,6 @@ public class HeartBeatResponse {
this.hasMappedComponents = hasMappedComponents;
}
- @JsonProperty("alertDefinitionHashes")
- public Map<String, String> getAlertDefinitionHash() {
- return alertDefinitionHashes;
- }
-
- @JsonProperty("alertDefinitionHashes")
- public void setAlertDefinitionHash(Map<String, String> alertDefinitionHashes) {
- this.alertDefinitionHashes = alertDefinitionHashes;
- }
-
public void addExecutionCommand(ExecutionCommand execCmd) {
executionCommands.add(execCmd);
}
@@ -180,7 +169,6 @@ public class HeartBeatResponse {
buffer.append(", alertDefinitionCommands=").append(alertDefinitionCommands);
buffer.append(", registrationCommand=").append(registrationCommand);
buffer.append(", restartAgent=").append(restartAgent);
- buffer.append(", alertDefinitionHashes=").append(alertDefinitionHashes);
buffer.append('}');
return buffer.toString();
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/68042051/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
index 687a3d0..489fbb2 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
@@ -91,7 +91,6 @@ import org.apache.ambari.server.security.unsecured.rest.CertificateSign;
import org.apache.ambari.server.security.unsecured.rest.ConnectionInfo;
import org.apache.ambari.server.state.Clusters;
import org.apache.ambari.server.state.ConfigHelper;
-import org.apache.ambari.server.state.alert.AlertDefinitionHash;
import org.apache.ambari.server.utils.StageUtils;
import org.apache.ambari.server.utils.VersionUtils;
import org.apache.ambari.server.view.ViewRegistry;
http://git-wip-us.apache.org/repos/asf/ambari/blob/68042051/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProviderTest.java
index 6d73727..ab74614 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProviderTest.java
@@ -82,8 +82,6 @@ public class AlertDefinitionResourceProviderTest {
private static String DEFINITION_UUID = UUID.randomUUID().toString();
- private static String DEFINITION_UUID = UUID.randomUUID().toString();
-
@Before
public void before() {
dao = createStrictMock(AlertDefinitionDAO.class);