You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2013/08/09 12:03:42 UTC

git commit: AMBARI-2853 MR2 smoke test should check YARN is started(atkach)

Updated Branches:
  refs/heads/trunk 1000552c1 -> 65662172f


AMBARI-2853 MR2 smoke test should check YARN is started(atkach)


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

Branch: refs/heads/trunk
Commit: 65662172fbf3fb67caaf992f71128054273a66b1
Parents: 1000552
Author: atkach <an...@gmail.com>
Authored: Fri Aug 9 13:03:36 2013 +0300
Committer: atkach <an...@gmail.com>
Committed: Fri Aug 9 13:03:36 2013 +0300

----------------------------------------------------------------------
 ambari-web/app/controllers/main/service/item.js | 4 ++++
 ambari-web/app/messages.js                      | 1 +
 2 files changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/65662172/ambari-web/app/controllers/main/service/item.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/item.js b/ambari-web/app/controllers/main/service/item.js
index 752fc76..ec56c6a 100644
--- a/ambari-web/app/controllers/main/service/item.js
+++ b/ambari-web/app/controllers/main/service/item.js
@@ -162,6 +162,10 @@ App.MainServiceItemController = Em.Controller.extend({
    */
   runSmokeTest: function (event) {
     var self = this;
+    if (this.get('content.serviceName') === 'MAPREDUCE2' && !App.Service.find('YARN').get('isStarted')) {
+      App.showAlertPopup(Em.I18n.t('common.error'), Em.I18n.t('services.mapreduce2.smokeTest.requirement'));
+      return;
+    }
     App.showConfirmationPopup(function() {
       self.runSmokeTestPrimary();
     });

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/65662172/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index fc93bfd..67fed0f 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1022,6 +1022,7 @@ Em.I18n.translations = {
 
   'services.mapreduce2.history.running': 'History server is running',
   'services.mapreduce2.history.stopped': 'History server is stopped',
+  'services.mapreduce2.smokeTest.requirement': 'MapReduce2 smoke test requires YARN service be started',
 
   'services.mapReduce.config.addQueue':'Add Queue',
   'services.mapReduce.config.editQueue':'Edit Queue',