You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vg...@apache.org on 2011/10/15 00:31:41 UTC
svn commit: r1183534 - in /incubator/ambari/trunk: ./
controller/src/main/java/org/apache/ambari/controller/
Author: vgogate
Date: Fri Oct 14 22:31:41 2011
New Revision: 1183534
URL: http://svn.apache.org/viewvc?rev=1183534&view=rev
Log:
AMBARI-76
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Blueprints.java
incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Clusters.java
incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Nodes.java
Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1183534&r1=1183533&r2=1183534&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Fri Oct 14 22:31:41 2011
@@ -2,6 +2,8 @@ Ambari Change log
Release 0.1.0 - unreleased
+ AMBARI-76. Register new node w/ Ambari controller (vgogate)
+
AMBARI-75. Centralize agent configuration parsing. (Eric Yang)
AMBARI-74. Throttle the frequency of checking action queue to 5 seconds.
Modified: incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Blueprints.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Blueprints.java?rev=1183534&r1=1183533&r2=1183534&view=diff
==============================================================================
--- incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Blueprints.java (original)
+++ incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Blueprints.java Fri Oct 14 22:31:41 2011
@@ -58,12 +58,14 @@ public class Blueprints {
public void createDummyBlueprint (String name, String revision, String siteName, String siteVersion) {
Blueprint bp = new Blueprint();
+
bp.setName(name);
bp.setParentName(siteName);
bp.setRevision(revision);
bp.setParentRevision(siteVersion);
- Component hdfsC = new Component(); hdfsC.setName("hdfs");
+ Component hdfsC = new Component();
+ hdfsC.setName("hdfs");
hdfsC.setArchitecture("x86_64");
hdfsC.setVersion("0.20.205.0");
Component mapredC = new Component(); mapredC.setName("mapred");
Modified: incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Clusters.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Clusters.java?rev=1183534&r1=1183533&r2=1183534&view=diff
==============================================================================
--- incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Clusters.java (original)
+++ incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Clusters.java Fri Oct 14 22:31:41 2011
@@ -439,17 +439,13 @@ public class Clusters {
all_nodes.get(node_name).reserveNodeForCluster(clusterID, true);
}
} else {
- Node node = new Node(node_name);
- /*
- * Set the heartbeat time to very old epoch value
- */
Date epoch = new Date(0);
- node.getNodeState().setLastHeartbeatTime(epoch);
+ Nodes.getInstance().registerNewNode(node_name, epoch);
+ Node node = Nodes.getInstance().getNode(node_name);
/*
* TODO: Set agentInstalled = true, unless controller uses SSH to setup the agent
*/
node.reserveNodeForCluster(clusterID, true);
- Nodes.getInstance().getNodes().put(node_name, node);
}
}
Modified: incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Nodes.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Nodes.java?rev=1183534&r1=1183533&r2=1183534&view=diff
==============================================================================
--- incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Nodes.java (original)
+++ incubator/ambari/trunk/controller/src/main/java/org/apache/ambari/controller/Nodes.java Fri Oct 14 22:31:41 2011
@@ -169,6 +169,15 @@ public class Nodes {
}
/*
+ * Register new node
+ */
+ public void registerNewNode (String name, Date hearbeatTime) throws Exception {
+ Node node = new Node(name);
+ node.getNodeState().setLastHeartbeatTime(hearbeatTime);
+ Nodes.getInstance().getNodes().put(name, node);
+ }
+
+ /*
* Get time difference
*/
public long getTimeDiffInMillis (XMLGregorianCalendar t2, XMLGregorianCalendar t1) throws Exception {