ambari git commit: AMBARI-13355. Journal node went in critical state on Ambari : message on UI : Connection failed: [Errno 111] Connection refused to 0.0.0.0:8480 (aonishuk)

2015-10-12 Thread aonishuk 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 7ba85ef21 -> f0fec9578


AMBARI-13355. Journal node went in critical state on Ambari : message on UI :  
Connection failed: [Errno 111] Connection refused to 0.0.0.0:8480 (aonishuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f0fec957
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f0fec957
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f0fec957

Branch: refs/heads/branch-2.1
Commit: f0fec9578b0aed69f8426b01aa32c5a586360563
Parents: 7ba85ef
Author: Andrew Onishuk 
Authored: Mon Oct 12 17:46:18 2015 +0300
Committer: Andrew Onishuk 
Committed: Mon Oct 12 17:47:06 2015 +0300

--
 .../server/upgrade/AbstractUpgradeCatalog.java  |  14 ++
 .../server/upgrade/SchemaUpgradeHelper.java |   3 +
 .../server/upgrade/UpgradeCatalog213.java   |  80 ++-
 .../server/utils/EventBusSynchronizer.java  | 139 +++
 .../common-services/HDFS/2.1.0.2.0/alerts.json  |  25 ++--
 .../server/upgrade/UpgradeCatalog213Test.java   |  23 +++
 .../server/utils/EventBusSynchronizer.java  | 139 ---
 7 files changed, 273 insertions(+), 150 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f0fec957/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
index 62cd868..ed68313 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
@@ -341,6 +341,20 @@ public abstract class AbstractUpgradeCatalog implements 
UpgradeCatalog {
   }
 
   /**
+   * This method returns Map of clusters.
+   * Map can be empty or with some objects, but never be null.
+   */
+  protected Map getCheckedClusterMap(Clusters clusters) {
+if (clusters != null) {
+  Map clusterMap = clusters.getClusters();
+  if (clusterMap != null) {
+return clusterMap;
+  }
+}
+return new HashMap<>();
+  }
+
+  /**
* Create a new cluster scoped configuration with the new properties added
* with the values from the coresponding xml files.
*

http://git-wip-us.apache.org/repos/asf/ambari/blob/f0fec957/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
index cd57df1..7453d4b 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
@@ -30,6 +30,7 @@ import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.configuration.Configuration;
 import org.apache.ambari.server.controller.ControllerModule;
 import org.apache.ambari.server.orm.DBAccessor;
+import org.apache.ambari.server.utils.EventBusSynchronizer;
 import org.apache.ambari.server.utils.VersionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -181,6 +182,8 @@ public class SchemaUpgradeHelper {
   catalogBinder.addBinding().to(UpgradeCatalog212.class);
   catalogBinder.addBinding().to(UpgradeCatalog213.class);
   catalogBinder.addBinding().to(FinalUpgradeCatalog.class);
+
+  EventBusSynchronizer.synchronizeAmbariEventPublisher(binder());
 }
   }
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/f0fec957/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
index dcdbb85..2c152e4 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
@@ -18,20 +18,28 @@
 
 package org.apache.ambari.server.upgrade;
 
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
 import com.google.inject.Inject;
 import com.google.inject.Injector;
 import org.apache.ambari.server.AmbariException;
 import

ambari git commit: AMBARI-13355. Journal node went in critical state on Ambari : message on UI : Connection failed: [Errno 111] Connection refused to 0.0.0.0:8480 (aonishuk)

2015-10-12 Thread aonishuk 
Repository: ambari
Updated Branches:
  refs/heads/trunk e8dbb1327 -> 9b0c24687


AMBARI-13355. Journal node went in critical state on Ambari : message on UI :  
Connection failed: [Errno 111] Connection refused to 0.0.0.0:8480 (aonishuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9b0c2468
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9b0c2468
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9b0c2468

Branch: refs/heads/trunk
Commit: 9b0c24687fe47624e8284daf3609b1134e330323
Parents: e8dbb13
Author: Andrew Onishuk 
Authored: Mon Oct 12 17:47:33 2015 +0300
Committer: Andrew Onishuk 
Committed: Mon Oct 12 17:48:05 2015 +0300

--
 .../server/upgrade/AbstractUpgradeCatalog.java  |  14 ++
 .../server/upgrade/SchemaUpgradeHelper.java |   3 +
 .../server/upgrade/UpgradeCatalog213.java   |  80 ++-
 .../server/utils/EventBusSynchronizer.java  | 139 +++
 .../common-services/HDFS/2.1.0.2.0/alerts.json  |  25 ++--
 .../server/upgrade/UpgradeCatalog213Test.java   |  25 +++-
 .../server/utils/EventBusSynchronizer.java  | 139 ---
 7 files changed, 274 insertions(+), 151 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9b0c2468/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
index 62cd868..ed68313 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
@@ -341,6 +341,20 @@ public abstract class AbstractUpgradeCatalog implements 
UpgradeCatalog {
   }
 
   /**
+   * This method returns Map of clusters.
+   * Map can be empty or with some objects, but never be null.
+   */
+  protected Map getCheckedClusterMap(Clusters clusters) {
+if (clusters != null) {
+  Map clusterMap = clusters.getClusters();
+  if (clusterMap != null) {
+return clusterMap;
+  }
+}
+return new HashMap<>();
+  }
+
+  /**
* Create a new cluster scoped configuration with the new properties added
* with the values from the coresponding xml files.
*

http://git-wip-us.apache.org/repos/asf/ambari/blob/9b0c2468/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
index ca7707b..c77b724 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/SchemaUpgradeHelper.java
@@ -30,6 +30,7 @@ import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.configuration.Configuration;
 import org.apache.ambari.server.controller.ControllerModule;
 import org.apache.ambari.server.orm.DBAccessor;
+import org.apache.ambari.server.utils.EventBusSynchronizer;
 import org.apache.ambari.server.utils.VersionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -182,6 +183,8 @@ public class SchemaUpgradeHelper {
   catalogBinder.addBinding().to(UpgradeCatalog213.class);
   catalogBinder.addBinding().to(UpgradeCatalog220.class);
   catalogBinder.addBinding().to(FinalUpgradeCatalog.class);
+
+  EventBusSynchronizer.synchronizeAmbariEventPublisher(binder());
 }
   }
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/9b0c2468/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
index dcdbb85..2c152e4 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
@@ -18,20 +18,28 @@
 
 package org.apache.ambari.server.upgrade;
 
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
 import com.google.inject.Inject;
 import com.google.inject.Injector;
 import org.apache.ambari.server.AmbariException;
 import