Author: yusaku
Date: Fri Jan 11 01:52:18 2013
New Revision: 1431798
URL: http://svn.apache.org/viewvc?rev=1431798&view=rev
Log:
AMBARI-1113. Install Wizard: Confirm host stuck at Preparing stage. (Arun
Kandregula via yusaku)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/assets/data/apps/jobs/taskview.json
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step3_controller.js
incubator/ambari/trunk/ambari-web/app/utils/graph.js
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1431798&r1=1431797&r2=1431798&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Fri Jan 11 01:52:18 2013
@@ -675,6 +675,9 @@ AMBARI-666 branch (unreleased changes)
BUG FIXES
+ AMBARI-1113. Install Wizard: Confirm host stuck at Preparing stage.
+ (Arun Kandregula via yusaku)
+
AMBARI-1112. Add hosts fails second time around. (Srimanth Gunturi via
yusaku)
Modified:
incubator/ambari/trunk/ambari-web/app/assets/data/apps/jobs/taskview.json
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/assets/data/apps/jobs/taskview.json?rev=1431798&r1=1431797&r2=1431798&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/assets/data/apps/jobs/taskview.json
(original)
+++ incubator/ambari/trunk/ambari-web/app/assets/data/apps/jobs/taskview.json
Fri Jan 11 01:52:18 2013
@@ -1,13 +1,13 @@
{
"mapNodeLocal": [
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353963926,
"y": 0
},
{
- "IO": 32616,
+ "io": 32616,
"label": "attempt_201211241031_0008_m_000000_0",
"r": 12,
"status": "SUCCESS",
@@ -15,127 +15,127 @@
"y": 11007
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964071,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964074,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964080,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964083,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964092,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964095,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964104,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964107,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964116,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964119,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964128,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964131,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964140,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964143,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964152,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964155,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964164,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964167,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964176,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964179,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964197,
"y": 0
@@ -143,139 +143,139 @@
],
"mapRackLocal": [
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353963926,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964059,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964071,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964074,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964080,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964083,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964092,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964095,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964104,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964107,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964116,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964119,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964128,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964131,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964140,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964143,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964152,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964155,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964164,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964167,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964176,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964179,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964197,
"y": 0
@@ -283,139 +283,139 @@
],
"mapOffSwitch": [
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353963926,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964059,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964071,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964074,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964080,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964083,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964092,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964095,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964104,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964107,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964116,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964119,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964128,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964131,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964140,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964143,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964152,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964155,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964164,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964167,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964176,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964179,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964197,
"y": 0
@@ -423,19 +423,19 @@
],
"reduceOffSwitch": [
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353963926,
"y": 0
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964059,
"y": 0
},
{
- "IO": 31658,
+ "io": 31658,
"label": "attempt_201211241031_0008_r_000000_0",
"r": 12,
"status": "SUCCESS",
@@ -443,7 +443,7 @@
"y": 10572
},
{
- "IO": 31700,
+ "io": 31700,
"label": "attempt_201211241031_0008_r_000001_0",
"r": 12,
"status": "SUCCESS",
@@ -451,7 +451,7 @@
"y": 10651
},
{
- "IO": 31658,
+ "io": 31658,
"label": "attempt_201211241031_0008_r_000002_0",
"r": 12,
"status": "SUCCESS",
@@ -459,7 +459,7 @@
"y": 15123
},
{
- "IO": 31658,
+ "io": 31658,
"label": "attempt_201211241031_0008_r_000003_0",
"r": 12,
"status": "SUCCESS",
@@ -467,7 +467,7 @@
"y": 15007
},
{
- "IO": 31706,
+ "io": 31706,
"label": "attempt_201211241031_0008_r_000004_0",
"r": 12,
"status": "SUCCESS",
@@ -475,7 +475,7 @@
"y": 13555
},
{
- "IO": 31658,
+ "io": 31658,
"label": "attempt_201211241031_0008_r_000005_0",
"r": 12,
"status": "SUCCESS",
@@ -483,7 +483,7 @@
"y": 13326
},
{
- "IO": 31658,
+ "io": 31658,
"label": "attempt_201211241031_0008_r_000006_0",
"r": 12,
"status": "SUCCESS",
@@ -491,7 +491,7 @@
"y": 15120
},
{
- "IO": 31658,
+ "io": 31658,
"label": "attempt_201211241031_0008_r_000007_0",
"r": 12,
"status": "SUCCESS",
@@ -499,7 +499,7 @@
"y": 14947
},
{
- "IO": 31658,
+ "io": 31658,
"label": "attempt_201211241031_0008_r_000008_0",
"r": 12,
"status": "SUCCESS",
@@ -507,7 +507,7 @@
"y": 13493
},
{
- "IO": 31658,
+ "io": 31658,
"label": "attempt_201211241031_0008_r_000009_0",
"r": 12,
"status": "SUCCESS",
@@ -515,7 +515,7 @@
"y": 13349
},
{
- "IO": 31659,
+ "io": 31659,
"label": "attempt_201211241031_0008_r_000010_0",
"r": 12,
"status": "SUCCESS",
@@ -523,7 +523,7 @@
"y": 15011
},
{
- "IO": 31659,
+ "io": 31659,
"label": "attempt_201211241031_0008_r_000011_0",
"r": 12,
"status": "SUCCESS",
@@ -531,7 +531,7 @@
"y": 11646
},
{
- "IO": 31659,
+ "io": 31659,
"label": "attempt_201211241031_0008_r_000012_0",
"r": 12,
"status": "SUCCESS",
@@ -539,7 +539,7 @@
"y": 13337
},
{
- "IO": 31701,
+ "io": 31701,
"label": "attempt_201211241031_0008_r_000013_0",
"r": 12,
"status": "SUCCESS",
@@ -547,7 +547,7 @@
"y": 10900
},
{
- "IO": 31659,
+ "io": 31659,
"label": "attempt_201211241031_0008_r_000014_0",
"r": 12,
"status": "SUCCESS",
@@ -555,7 +555,7 @@
"y": 14688
},
{
- "IO": 31659,
+ "io": 31659,
"label": "attempt_201211241031_0008_r_000015_0",
"r": 12,
"status": "SUCCESS",
@@ -563,7 +563,7 @@
"y": 10592
},
{
- "IO": 31659,
+ "io": 31659,
"label": "attempt_201211241031_0008_r_000016_0",
"r": 12,
"status": "SUCCESS",
@@ -571,7 +571,7 @@
"y": 15100
},
{
- "IO": 31659,
+ "io": 31659,
"label": "attempt_201211241031_0008_r_000017_0",
"r": 12,
"status": "SUCCESS",
@@ -579,7 +579,7 @@
"y": 10719
},
{
- "IO": 31659,
+ "io": 31659,
"label": "attempt_201211241031_0008_r_000018_0",
"r": 12,
"status": "SUCCESS",
@@ -587,7 +587,7 @@
"y": 14973
},
{
- "IO": 31659,
+ "io": 31659,
"label": "attempt_201211241031_0008_r_000019_0",
"r": 12,
"status": "SUCCESS",
@@ -595,7 +595,7 @@
"y": 10534
},
{
- "IO": 0,
+ "io": 0,
"r": 0,
"x": 1353964197,
"y": 0
Modified:
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step3_controller.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard/step3_controller.js?rev=1431798&r1=1431797&r2=1431798&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step3_controller.js
(original)
+++
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step3_controller.js
Fri Jan 11 01:52:18 2013
@@ -110,6 +110,7 @@ App.WizardStep3Controller = Em.Controlle
this.set('stopBootstrap', false);
this.hosts.clear();
this.bootHosts.clear();
+ App.db.setBootStatus(false);
this.set('isSubmitDisabled', true);
this.set('isRetryDisabled', true);
},
Modified: incubator/ambari/trunk/ambari-web/app/utils/graph.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/utils/graph.js?rev=1431798&r1=1431797&r2=1431798&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/utils/graph.js (original)
+++ incubator/ambari/trunk/ambari-web/app/utils/graph.js Fri Jan 11 01:52:18
2013
@@ -194,7 +194,7 @@ module.exports = {
var swatch = '<span class="detail_swatch" style="background-color: ' +
series.color + '"></span>';
return swatch + d.value.label +
'<br>Run-time: ' + formattedY + '<br>Wait-time: ' + formattedX +
- '<br>I/O: ' + bytesFormatter(d.value.IO) + '<br>Status: ' +
d.value.status;
+ '<br>I/O: ' + bytesFormatter(d.value.io) + '<br>Status: ' +
d.value.status;
}
});
