TEZ-1823. default ATS url should be the same host as ui (Prakash Rama…

…chandran via Rajesh Balamohan)
appcoreopc · Dec 8, 2014 · 58a9119 · 58a9119
1 parent 7f44359
commit 58a9119
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 11 deletions.
diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/dag_tasks.js b/tez-ui/src/main/webapp/app/scripts/controllers/dag_tasks.js
@@ -49,6 +49,7 @@ App.DagTasksController = Em.ObjectController.extend(App.PaginatedContentMixin, A
     store = this.get('store'),
     fetcher;
     childEntityType = this.get('childEntityType');
+    var defaultErrMsg = 'Error while loading tasks. could not connect to %@'.fmt(App.env.timelineBaseUrl);
 
     store.unloadAll(childEntityType);
     store.findQuery(childEntityType, this.getFilterProperties()).then(function(entities){
@@ -70,7 +71,7 @@ App.DagTasksController = Em.ObjectController.extend(App.PaginatedContentMixin, A
       });
     }).catch(function(error){
       Em.Logger.error(error);
-      var err = App.Helpers.misc.formatError(error);
+      var err = App.Helpers.misc.formatError(error, defaultErrMsg);
       var msg = 'error code: %@, message: %@'.fmt(err.errCode, err.msg);
       App.Helpers.ErrorBar.getInstance().show(msg, error.details);
     });

diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/dags_controller.js b/tez-ui/src/main/webapp/app/scripts/controllers/dags_controller.js
@@ -74,6 +74,7 @@ App.DagsController = Em.ObjectController.extend(App.PaginatedContentMixin, App.C
     store = this.get('store'),
     childEntityType = this.get('childEntityType'),
     fetcher;
+    var defaultErrMsg = 'Error while loading dag info. could not connect to %@'.fmt(App.env.timelineBaseUrl);
 
     store.unloadAll(childEntityType);
     store.findQuery(childEntityType, this.getFilterProperties()).then(function(entities){
@@ -101,7 +102,7 @@ App.DagsController = Em.ObjectController.extend(App.PaginatedContentMixin, App.C
       });
     }).catch(function(error){
       Em.Logger.error(error);
-      var err = App.Helpers.misc.formatError(error);
+      var err = App.Helpers.misc.formatError(error, defaultErrMsg);
       var msg = 'error code: %@, message: %@'.fmt(err.errCode, err.msg);
       App.Helpers.ErrorBar.getInstance().show(msg, err.details);
     });

diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/vertex_tasks_controller.js b/tez-ui/src/main/webapp/app/scripts/controllers/vertex_tasks_controller.js
@@ -46,6 +46,7 @@ App.VertexTasksController = Em.ObjectController.extend(App.PaginatedContentMixin
     store = this.get('store'),
     fetcher;
     childEntityType = this.get('childEntityType');
+    var defaultErrMsg = 'Error while loading tasks. could not connect to %@'.fmt(App.env.timelineBaseUrl);
 
     store.unloadAll(childEntityType);
     store.findQuery(childEntityType, this.getFilterProperties()).then(function(entities){
@@ -67,7 +68,7 @@ App.VertexTasksController = Em.ObjectController.extend(App.PaginatedContentMixin
       });
     }).catch(function(jqXHR){
       Em.Logger.error(error);
-      var err = App.Helpers.misc.formatError(error);
+      var err = App.Helpers.misc.formatError(error, defaultErrMsg);
       var msg = 'error code: %@, message: %@'.fmt(err.errCode, err.msg);
       App.Helpers.ErrorBar.getInstance().show(msg, err.details);
     });

diff --git a/tez-ui/src/main/webapp/app/scripts/default-configs.js b/tez-ui/src/main/webapp/app/scripts/default-configs.js
@@ -16,12 +16,26 @@
  * limitations under the License.
  */
 
+var getDefaultTimelineUrl = function() {
+  var location = window.location;
+  var protocol = App.env.isStandalone ? location.protocol : 'http';
+  var hostname = App.env.isStandalone ? location.hostname : 'localhost';
+  return '%@//%@:8188'.fmt(protocol, hostname);
+};
+
+var getDefaultRMWebUrl = function() {
+  var location = window.location;
+  var protocol = App.env.isStandalone ? location.protocol : 'http';
+  var hostname = App.env.isStandalone ? location.hostname : 'localhost';
+  return '%@//%@:8088'.fmt(protocol, hostname);
+};
+
 $.extend(true, App.Configs, {
   envDefaults: {
     version: "0.6.0",
 
-    timelineBaseUrl: 'http://localhost:8188',
-    RMWebUrl: 'http://localhost:8088',
+    timelineBaseUrl: getDefaultTimelineUrl(),
+    RMWebUrl: getDefaultRMWebUrl(),
   },
 
   restNamespace: {

diff --git a/tez-ui/src/main/webapp/app/scripts/helpers/misc.js b/tez-ui/src/main/webapp/app/scripts/helpers/misc.js
@@ -133,9 +133,17 @@ App.Helpers.misc = {
    * returns a formatted message, the real cause is unknown and the error object details
    * depends on the error cause. the function tries to handle ajax error or a native errors
    */
-  formatError: function(error) {
-    var msg = error.statusText || error.message || '';
-    if (error.responseText) {
+  formatError: function(error, defaultErrorMessage) {
+    var msg;
+    // for cross domain requests, the error is not set if no access control headers were found.
+    // this could be either because there was a n/w error or the cors headers being not set.
+    if (error.status === 0 && error.statusText === 'error') {
+      msg = defaultErrorMessage ;
+    } else {
+      msg = error.statusText || error.message;
+    }
+    msg = msg || 'Unknown error';
+    if (!!error.responseText) {
       msg += error.responseText;
     }
     return {
@@ -177,4 +185,4 @@ App.Helpers.misc = {
     replace: true
   }
 
-}
+}
diff --git a/tez-ui/src/main/webapp/app/scripts/mixins/paginated_content.js b/tez-ui/src/main/webapp/app/scripts/mixins/paginated_content.js
@@ -48,6 +48,9 @@ App.PaginatedContentMixin = Em.Mixin.create({
   loadEntities: function() {
     var that = this;
     var childEntityType = this.get('childEntityType');
+    var defaultErrMsg = 'Error while loading %@. could not connect to %@'
+      .fmt(childEntityType, App.env.timelineBaseUrl);
+
 
     that.set('loading', true);
 
@@ -57,7 +60,7 @@ App.PaginatedContentMixin = Em.Mixin.create({
       that.set('loading', false);
     }).catch(function(jqXHR){
       Em.Logger.error(error);
-      var err = App.Helpers.misc.formatError(error);
+      var err = App.Helpers.misc.formatError(error, defaultErrMsg);
       var msg = 'error code: %@, message: %@'.fmt(err.errCode, err.msg);
       App.Helpers.ErrorBar.getInstance().show(msg, err.details);
     });

diff --git a/tez-ui/src/main/webapp/app/scripts/router.js b/tez-ui/src/main/webapp/app/scripts/router.js
@@ -110,7 +110,8 @@ App.ApplicationRoute = Em.Route.extend({
     error: function(error, transition, originRoute) {
       this.replaceWith('error');
       Em.Logger.error(error);
-      var err = App.Helpers.misc.formatError(error);
+      var defaultError = 'Error while loading %@. could not connect to %@'.fmt(transition.targetName, App.env.timelineBaseUrl);
+      var err = App.Helpers.misc.formatError(error, defaultError);
       var msg = 'error code: %@, message: %@'.fmt(err.errCode, err.msg);
       App.Helpers.ErrorBar.getInstance().show(msg, error.details);
     }

diff --git a/tez-ui/src/main/webapp/app/styles/main.less b/tez-ui/src/main/webapp/app/styles/main.less
@@ -188,6 +188,8 @@ body, html, body > .ember-view {
 
   .details {
     display: none;
+    overflow: auto;
+    max-height: 300px;
 
     &.visible {
       display: inline;