|
@@ -139,6 +139,10 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
|
|
|
* @type {boolean} true if some request that should disable actions is in progress
|
|
|
*/
|
|
|
requestInProgress: false,
|
|
|
+ /**
|
|
|
+ * @type {number} repo id, request for which is currently in progress
|
|
|
+ */
|
|
|
+ requestInProgressRepoId: null,
|
|
|
/**
|
|
|
* @type {boolean} true while no updated upgrade info is loaded after retry
|
|
|
*/
|
|
@@ -1140,6 +1144,8 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
|
|
|
*/
|
|
|
installRepoVersion: function (repo) {
|
|
|
this.set('requestInProgress', true);
|
|
|
+ this.set('requestInProgressRepoId', repo.get('id'));
|
|
|
+
|
|
|
var data = {
|
|
|
ClusterStackVersions: {
|
|
|
stack: repo.get('stackVersionType'),
|
|
@@ -1156,6 +1162,7 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
|
|
|
error: 'installRepoVersionError',
|
|
|
callback: function() {
|
|
|
this.sender.set('requestInProgress', false);
|
|
|
+ this.sender.set('requestInProgressRepoId', null);
|
|
|
}
|
|
|
});
|
|
|
},
|
|
@@ -1293,6 +1300,10 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
|
|
|
* @method installStackVersionSuccess
|
|
|
*/
|
|
|
installRepoVersionSuccess: function (data, opt, params) {
|
|
|
+ if(data && data.statusText == "timeout") {
|
|
|
+ App.showAlertPopup(Em.I18n.t('admin.stackVersions.upgrade.installPackage.fail.title'), Em.I18n.t('admin.stackVersions.upgrade.installPackage.fail.timeout'));
|
|
|
+ return false;
|
|
|
+ }
|
|
|
var version = App.RepositoryVersion.find(params.id);
|
|
|
App.db.set('repoVersionInstall', 'id', [data.Requests.id]);
|
|
|
App.clusterStatus.setClusterStatus({
|
|
@@ -1320,6 +1331,9 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
|
|
|
body = json.message;
|
|
|
} catch (err) {}
|
|
|
}
|
|
|
+ if(data && data.statusText == "timeout") {
|
|
|
+ body = Em.I18n.t('admin.stackVersions.upgrade.installPackage.fail.timeout');
|
|
|
+ }
|
|
|
App.showAlertPopup(header, body);
|
|
|
},
|
|
|
|