[ambari] branch trunk updated: [AMBARI-23756] Ambari Infra Solr Service Check fails after Ambari Upgrade

[rl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rlevas pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
     new b0e5419  [AMBARI-23756] Ambari Infra Solr Service Check fails after Ambari Upgrade
b0e5419 is described below

commit b0e5419778b3dd95f1f81ca2da1b297e0ad12ef9
Author: Robert Levas <rl...@hortonworks.com>
AuthorDate: Thu May 3 15:53:20 2018 -0400

    [AMBARI-23756] Ambari Infra Solr Service Check fails after Ambari Upgrade
---
 .../main/java/org/apache/ambari/server/state/Clusters.java  |  5 +++++
 .../apache/ambari/server/state/cluster/ClustersImpl.java    | 13 +++++++++++++
 .../org/apache/ambari/server/upgrade/UpgradeCatalog270.java |  4 ++++
 3 files changed, 22 insertions(+)

diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/Clusters.java b/ambari-server/src/main/java/org/apache/ambari/server/state/Clusters.java
index b4694ac..180089f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/Clusters.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/Clusters.java
@@ -285,4 +285,9 @@ public interface Clusters {
    */
   void invalidate(Cluster cluster);
 
+  /**
+   * Invalidates all clusters by retrieving each from the database and refreshing all of its internal
+   * stateful collections.
+   */
+  void invalidateAllClusters();
 }
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClustersImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClustersImpl.java
index 1c9a41f..cad7e0c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClustersImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClustersImpl.java
@@ -1006,4 +1006,17 @@ public class ClustersImpl implements Clusters {
     getClustersByName().put(clusterEntity.getClusterName(), currentCluster);
     getClustersById().put(currentCluster.getClusterId(), currentCluster);
   }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public void invalidateAllClusters() {
+    if(clustersByName != null) {
+      Collection<Cluster> clusters = clustersByName.values();
+      for (Cluster cluster : clusters) {
+        invalidate(cluster);
+      }
+    }
+  }
 }
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog270.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog270.java
index ff56cb1..efd0f27 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog270.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog270.java
@@ -1018,6 +1018,10 @@ public class UpgradeCatalog270 extends AbstractUpgradeCatalog {
         alertsDAO.merge(alertHistoryEntity);
       }
     }
+
+    // Force the clusters object to reload to ensure the renamed service is accounted for
+    getEntityManagerProvider().get().getEntityManagerFactory().getCache().evictAll();
+    clusters.invalidateAllClusters();
   }
 
   @Override

-- 
To stop receiving notification emails like this one, please contact
rlevas@apache.org.