incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jai...@apache.org
Subject svn commit: r1484036 - in /incubator/ambari/trunk: CHANGES.txt ambari-web/app/controllers/main/service/item.js ambari-web/app/utils/ajax.js
Date Sat, 18 May 2013 00:22:54 GMT
Author: jaimin
Date: Sat May 18 00:22:54 2013
New Revision: 1484036

URL: http://svn.apache.org/r1484036
Log:
AMBARI-2156. zookeeper service check fails when zk client is not co-hosted with zk server.
(jaimin)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-web/app/controllers/main/service/item.js
    incubator/ambari/trunk/ambari-web/app/utils/ajax.js

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1484036&r1=1484035&r2=1484036&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Sat May 18 00:22:54 2013
@@ -865,6 +865,9 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-2156. zookeeper service check fails when zk client is not co-hosted
+ with zk server. (jaimin)
+
  AMBARI-2161. Datanode Start fails in secure cluster. (jaimin)
 
  AMBARI-2160. zookeeper smoke test fails with unknown host exception for

Modified: incubator/ambari/trunk/ambari-web/app/controllers/main/service/item.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/main/service/item.js?rev=1484036&r1=1484035&r2=1484036&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/main/service/item.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/main/service/item.js Sat May 18 00:22:54
2013
@@ -171,7 +171,8 @@ App.MainServiceItemController = Em.Contr
       'sender': this,
       'success':'runSmokeTestSuccessCallBack',
       'data': {
-        'serviceName': this.get('content.serviceName').toUpperCase()
+        'serviceName': this.get('content.serviceName'),
+        'actionName': this.get('content.serviceName') === 'ZOOKEEPER' ? 'ZOOKEEPER_QUORUM_SERVICE_CHECK'
: this.get('content.serviceName') + '_SERVICE_CHECK'
       }
     });
   },

Modified: incubator/ambari/trunk/ambari-web/app/utils/ajax.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/utils/ajax.js?rev=1484036&r1=1484035&r2=1484036&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/utils/ajax.js (original)
+++ incubator/ambari/trunk/ambari-web/app/utils/ajax.js Sat May 18 00:22:54 2013
@@ -65,7 +65,7 @@ var urls = {
     }
   },
   'service.item.smoke': {
-    'real': '/clusters/{clusterName}/services/{serviceName}/actions/{serviceName}_SERVICE_CHECK',
+    'real': '/clusters/{clusterName}/services/{serviceName}/actions/{actionName}',
     'mock': '/data/wizard/deploy/poll_1.json',
     'format': function () {
       return {



Mime
View raw message