incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject svn commit: r1480835 - in /incubator/ambari/trunk: CHANGES.txt ambari-web/app/controllers/wizard.js ambari-web/app/messages.js ambari-web/app/views/common/modal_popup.js
Date Thu, 09 May 2013 23:06:14 GMT
Author: yusaku
Date: Thu May  9 23:06:10 2013
New Revision: 1480835

URL: http://svn.apache.org/r1480835
Log:
AMBARI-2095. It's possible to get into a state where install retry is not possible if the
agent stops heartbeating. (jaimin via yusaku)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-web/app/controllers/wizard.js
    incubator/ambari/trunk/ambari-web/app/messages.js
    incubator/ambari/trunk/ambari-web/app/views/common/modal_popup.js

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1480835&r1=1480834&r2=1480835&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Thu May  9 23:06:10 2013
@@ -837,6 +837,9 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-2095. It's possible to get into a state where install retry is not
+ possible if the agent stops heartbeating. (jaimin via yusaku)
+
  AMBARI-2091. Custom JDK path not used when adding new hosts. (yusaku)
 
  AMBARI-2089. Post Ambari upgrade, Hive and Oozie fail to start after

Modified: incubator/ambari/trunk/ambari-web/app/controllers/wizard.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard.js?rev=1480835&r1=1480834&r2=1480835&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/wizard.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/wizard.js Thu May  9 23:06:10 2013
@@ -251,8 +251,6 @@ App.WizardController = Em.Controller.ext
     // clear requests since we are installing services
     // and we don't want to get tasks for previous install attempts
     this.set('content.cluster.oldRequestsId', []);
-    this.set('content.cluster.requestId', null);
-
     var clusterName = this.get('content.cluster.name');
     var data;
     var name;
@@ -332,10 +330,12 @@ App.WizardController = Em.Controller.ext
     console.log('Error message is: ' + request.responseText);
     var clusterStatus = {
       status: 'PENDING',
-      isInstallError: false,
+      requestId: this.get('content.cluster.requestId'),
+      isInstallError: true,
       isCompleted: false
     };
     this.saveClusterStatus(clusterStatus);
+    App.showAlertPopup(Em.I18n.t('common.errorPopup.header'), request.responseText);
   },
 
   bootstrapRequestId: null,

Modified: incubator/ambari/trunk/ambari-web/app/messages.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/messages.js?rev=1480835&r1=1480834&r2=1480835&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/messages.js (original)
+++ incubator/ambari/trunk/ambari-web/app/messages.js Thu May  9 23:06:10 2013
@@ -129,6 +129,7 @@ Em.I18n.translations = {
   'common.misc': 'Misc',
   'common.operations': 'Operations',
   'common.install': 'Install',
+  'common.errorPopup.header': 'An error has been encountered',
 
   'requestInfo.installComponents':'Install Components',
   'requestInfo.installServices':'Install Services',
@@ -1117,6 +1118,6 @@ Em.I18n.translations = {
 
   'quick.links.error.label': 'Hostname is undefined',
 
-  'contact.administrator': 'Contact System Administrator for more information!'
+  'contact.administrator': 'Contact System Administrator for more information'
 
 };
\ No newline at end of file

Modified: incubator/ambari/trunk/ambari-web/app/views/common/modal_popup.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/common/modal_popup.js?rev=1480835&r1=1480834&r2=1480835&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/common/modal_popup.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/common/modal_popup.js Thu May  9 23:06:10
2013
@@ -143,4 +143,27 @@ App.showConfirmationPopup = function(pri
       primary();
     }
   });
+}
+
+/**
+ * Show alert popup
+ *
+ * @param {String} header - header of the popup
+ * @param {String} body - body of the popup
+ * @param {Function} primary - function to call upon clicking the OK button
+ * @return {*}
+ */
+App.showAlertPopup = function(header, body, primary) {
+  return App.ModalPopup.show({
+    primary: Em.I18n.t('ok'),
+    secondary: null,
+    header: header,
+    body: body,
+    onPrimary: function() {
+      this.hide();
+      if (primary) {
+        primary();
+      }
+    }
+  });
 }
\ No newline at end of file



Mime
View raw message