'+ @@ -314,6 +334,12 @@ App.MainHostView = Em.View.extend({ var self = this; this.set('isFilterOpen', !this.get('isFilterOpen')); if (this.get('isFilterOpen')) { + var filters = App.router.get('mainHostController.filters.components'); + $('.filter-component').each(function() { + var componentId = parseInt($(this).attr('id').replace('component-', '')); + var index = filters.indexOf(componentId); + $(this).attr('checked', index == -1); + }); var dropDown = $('#filter-dropdown'); var firstClick = true; @@ -331,9 +357,6 @@ App.MainHostView = Em.View.extend({ if (this.get('controller.comeWithFilter')) { this.applyFilter(); this.closeFilters(); - this.set('controller.comeWithFilter', false); - } else { - this.clearFilter(this); } }, Added: incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/host/audit.js URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/host/audit.js?rev=1432332&view=auto ============================================================================== --- incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/host/audit.js (added) +++ incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/host/audit.js Fri Jan 11 23:41:06 2013 @@ -0,0 +1,26 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +var App = require('app'); + +App.MainHostAuditView = Em.View.extend({ + templateName: require('templates/main/host/audit'), + content:function(){ + return App.router.get('mainHostDetailsController.content'); + }.property('App.router.mainHostDetailsController.content') +}); \ No newline at end of file Modified: incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/host/summary.js URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/host/summary.js?rev=1432332&r1=1432331&r2=1432332&view=diff ============================================================================== --- incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/host/summary.js (original) +++ incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/host/summary.js Fri Jan 11 23:41:06 2013 @@ -93,7 +93,7 @@ App.MainHostSummaryView = Em.View.extend sortedComponents: function() { var slaveComponents = []; var masterComponents = []; - this.get('content.hostComponents').forEach(function(component){ + this.get('content.components').forEach(function(component){ if(component.get('isMaster')){ masterComponents.push(component); } else if(component.get('isSlave')) { @@ -104,7 +104,7 @@ App.MainHostSummaryView = Em.View.extend }.property('content'), clients: function(){ var clients = []; - this.get('content.hostComponents').forEach(function(component){ + this.get('content.components').forEach(function(component){ if(!component.get('componentName')){ //temporary fix because of different data in hostComponents and serviceComponents return; @@ -122,11 +122,6 @@ App.MainHostSummaryView = Em.View.extend ComponentView: Em.View.extend({ content: null, - didInsertElement: function () { - if (this.get('isInProgress')) { - this.doBlinking(); - } - }, hostComponent: function(){ var hostComponent = null; var serviceComponent = this.get('content'); @@ -143,7 +138,7 @@ App.MainHostSummaryView = Em.View.extend workStatus = hostComponent.get('workStatus'); } return workStatus; - }.property('content.workStatus','hostComponent.workStatus'), + }.property('content.workStatus', 'hostComponent.workStatus'), statusClass: function(){ var statusClass = null; if(this.get('isDataNode')){ @@ -152,14 +147,14 @@ App.MainHostSummaryView = Em.View.extend return 'health-status-DEAD-ORANGE'; } } - return 'health-status-' + App.HostComponentStatus.getKeyName(this.get('workStatus')); - }.property('workStatus', 'isDataNodeRecommissionAvailable'), + return 'health-status-' + App.Component.Status.getKeyName(this.get('workStatus')); + }.property('workStatus'), /** * Disable element while component is starting/stopping */ disabledClass:function(){ var workStatus = this.get('workStatus'); - if([App.HostComponentStatus.starting, App.HostComponentStatus.stopping].contains(workStatus) ){ + if([App.Component.Status.starting, App.Component.Status.stopping].contains(workStatus) ){ return 'disabled'; } else { return ''; @@ -171,7 +166,7 @@ App.MainHostSummaryView = Em.View.extend doBlinking : function(){ var workStatus = this.get('workStatus'); var self = this; - var pulsate = [ App.HostComponentStatus.starting, App.HostComponentStatus.stopping ].contains(workStatus); + var pulsate = [ App.Component.Status.starting, App.Component.Status.stopping ].contains(workStatus); if (!pulsate && this.get('isDataNode')) { var dataNodeComponent = this.get('content'); if (dataNodeComponent) @@ -187,17 +182,11 @@ App.MainHostSummaryView = Em.View.extend * Start blinking when host component is starting/stopping */ startBlinking:function(){ - this.$('.components-health').stop(true, true); - this.$('.components-health').css({opacity: 1.0}); this.doBlinking(); }.observes('workStatus'), isStart : function() { - return (this.get('workStatus') === App.HostComponentStatus.started || this.get('workStatus') === App.HostComponentStatus.starting); - }.property('workStatus'), - - isInProgress : function() { - return (this.get('workStatus') === App.HostComponentStatus.stopping || this.get('workStatus') === App.HostComponentStatus.starting); + return (this.get('workStatus') === App.Component.Status.started || this.get('workStatus') === App.Component.Status.starting); }.property('workStatus'), /** * Shows whether we need to show Decommision/Recomission buttons Added: incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/hosts.js URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/hosts.js?rev=1432332&view=auto ============================================================================== --- incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/hosts.js (added) +++ incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/hosts.js Fri Jan 11 23:41:06 2013 @@ -0,0 +1,23 @@ + /** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +var App = require('app'); + +App.MainHostsView = Em.View.extend({ + templateName: require('templates/main/hosts') +}); \ No newline at end of file Added: incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/audit.js URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/audit.js?rev=1432332&view=auto ============================================================================== --- incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/audit.js (added) +++ incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/audit.js Fri Jan 11 23:41:06 2013 @@ -0,0 +1,72 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +var App = require('app'); + +require('views/common/grid'); + +App.MainServiceInfoAuditView = App.Grid.extend({ +// audits: function() { +// return App.router.get('mainServiceInfoAuditController.content').get('serviceAudit'); +// }.property('App.router.mainServiceInfoAuditController.content'), + + prepareCollection:function () { + var audits = App.router.get('mainServiceInfoAuditController.content').get('serviceAudit'); + console.warn(" AUDITS: ", audits); + this.set('collection', audits); + }, + + addFilters: function(field, values){ + var filters = this.get('appliedFilters'); + filters[field] = values; + var collection = App.router.get('mainServiceInfoAuditController.content').get('serviceAudit'); + arrayCollection = collection.filter(function(data) { + var oneFilterFail = false; + $.each(filters, function(fieldname, values){ + if(values.indexOf(data.get(fieldname)) == -1) { + return oneFilterFail = true; + } + }); + return !oneFilterFail; + }); + + this.set('filteredArray', arrayCollection); + }, + + _collection: {className: App.ServiceAudit}, + prepareColumns:function () { + this._super(); + + this.addColumn({ + name:"date", + label:Em.I18n.t("admin.audit.grid.date") + }); + this.addColumn({ + name:"service.label", + label:Em.I18n.t("admin.audit.grid.service") + }); + this.addColumn({ + name:"operationName", + label:Em.I18n.t("admin.audit.grid.operationName") + }); + this.addColumn({ + name:"user.userName", + label:Em.I18n.t("admin.audit.grid.performedBy") + }); + } +}); \ No newline at end of file Added: incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics.js URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics.js?rev=1432332&view=auto ============================================================================== --- incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics.js (added) +++ incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/metrics.js Fri Jan 11 23:41:06 2013 @@ -0,0 +1,26 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +var App = require('app'); + +App.MainServiceInfoMetricsView = Em.View.extend({ + templateName: require('templates/main/service/info/metrics'), + alerts: function(){ + return App.router.get('mainAlertController.content'); + }.property('App.router.mainAlertController.content') +}); \ No newline at end of file Modified: incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/summary.js URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/summary.js?rev=1432332&r1=1432331&r2=1432332&view=diff ============================================================================== --- incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/summary.js (original) +++ incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/service/info/summary.js Fri Jan 11 23:41:06 2013 @@ -142,7 +142,7 @@ App.MainServiceInfoSummaryView = Em.View monitorsObj: function(){ var service = this.get('controller.content'); if (service.get("id") == "GANGLIA") { - var monitors = service.get('hostComponents').filterProperty('isMaster', false); + var monitors = service.get('components').filterProperty('isMaster', false); if (monitors.length) { return monitors[0]; } @@ -157,7 +157,7 @@ App.MainServiceInfoSummaryView = Em.View serversHost: function() { var service = this.get('controller.content'); if (service.get("id") == "ZOOKEEPER") { - var servers = service.get('hostComponents').filterProperty('isMaster'); + var servers = service.get('components').filterProperty('isMaster'); if (servers.length > 0) { return servers[0]; } @@ -172,7 +172,7 @@ App.MainServiceInfoSummaryView = Em.View clientObj: function() { var service = this.get('controller.content'); if (service.get("id") == "OOZIE" || service.get("id") == "ZOOKEEPER") { - var clients = service.get('hostComponents').filterProperty('isMaster', false); + var clients = service.get('components').filterProperty('isMaster', false); if (clients.length > 0) { return clients[0]; } @@ -190,7 +190,7 @@ App.MainServiceInfoSummaryView = Em.View gangliaServer:function(){ var service=this.get('controller.content'); if(service.get("id") == "GANGLIA"){ - return service.get("hostComponents").findProperty('isMaster', true).get("host").get("publicHostName"); + return service.get("components").findProperty('isMaster', true).get("host").get("publicHostName"); }else{ return ""; } @@ -198,7 +198,7 @@ App.MainServiceInfoSummaryView = Em.View nagiosServer:function(){ var service=this.get('controller.content'); if(service.get("id") == "NAGIOS"){ - return service.get("hostComponents").findProperty('isMaster', true).get("host").get("publicHostName"); + return service.get("components").findProperty('isMaster', true).get("host").get("publicHostName"); }else{ return ""; } @@ -206,7 +206,7 @@ App.MainServiceInfoSummaryView = Em.View oozieServer:function(){ var service=this.get('controller.content'); if(service.get("id") == "OOZIE"){ - return service.get("hostComponents").findProperty('isMaster', true).get("host").get("publicHostName"); + return service.get("components").findProperty('isMaster', true).get("host").get("publicHostName"); }else{ return ""; } @@ -224,7 +224,7 @@ App.MainServiceInfoSummaryView = Em.View var service=this.get('controller.content'); if(service.get("id") == "HIVE"){ var self = this; - var components = service.get("hostComponents"); + var components = service.get("components"); if(components){ components.forEach(function(component){ var ci = { Added: incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/test.js URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/test.js?rev=1432332&view=auto ============================================================================== --- incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/test.js (added) +++ incubator/ambari/branches/branch-1.2/ambari-web/app/views/main/test.js Fri Jan 11 23:41:06 2013 @@ -0,0 +1,24 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +var App = require('app'); + +App.MainTestView = Em.View.extend({ + templateName: require('templates/main/test'), + services: App.Service.find() +}); Modified: incubator/ambari/branches/branch-1.2/ambari-web/app/views/wizard/step2_view.js URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/ambari-web/app/views/wizard/step2_view.js?rev=1432332&r1=1432331&r2=1432332&view=diff ============================================================================== --- incubator/ambari/branches/branch-1.2/ambari-web/app/views/wizard/step2_view.js (original) +++ incubator/ambari/branches/branch-1.2/ambari-web/app/views/wizard/step2_view.js Fri Jan 11 23:41:06 2013 @@ -20,8 +20,7 @@ var App = require('app'); App.SshKeyFileUploader = Ember.View.extend({ - template:Ember.Handlebars.compile(''), - classNames: ['ssh-key-input-indentation'], + template:Ember.Handlebars.compile(''), change: function (e) { var self=this; @@ -62,9 +61,62 @@ App.WizardStep2View = Em.View.extend({ this.set('controller.sshKeyError',null); this.loadHostsInfo(); }, - + /** + * Config for displaying more hosts + * if oldHosts.length more than config.count that configuration will be applied + */ + hostDisplayConfig: [ + { + count: 0, + delimitery: '
', + popupDelimitery: '
' + }, + { + count: 10, + delimitery: ', ', + popupDelimitery: '
' + }, + { + count: 50, + delimitery: ', ', + popupDelimitery: ', ' + } + ], + showMoreHosts: function () { + var self = this; + App.ModalPopup.show({ + header: "Hosts are already part of the cluster and will be ignored", + body: self.get('hostsInfo.oldHostNamesMore'), + encodeBody: false, + onPrimary: function () { + this.hide(); + }, + secondary: null + }); + }, loadHostsInfo: function(){ + var hostsInfo = Em.Object.create(); + + var oldHostNames = App.Host.find().getEach('id'); + var k = 10; + + var usedConfig = false; + this.get('hostDisplayConfig').forEach(function (config) { + if (oldHostNames.length > config.count) { + usedConfig = config; + } + }); + + k = usedConfig.count ? usedConfig.count : oldHostNames.length; + var displayedHostNames = oldHostNames.slice(0, k); + hostsInfo.set('oldHostNames', displayedHostNames.join(usedConfig.delimitery)); + if (usedConfig.count) { + var moreHostNames = oldHostNames.slice(k + 1); + hostsInfo.set('oldHostNamesMore', moreHostNames.join(usedConfig.popupDelimitery)); + hostsInfo.set('showMoreHostsText', "...and %@ more".fmt(moreHostNames.length)); + } + this.set('hostsInfo', hostsInfo); }, @@ -80,10 +132,26 @@ App.WizardStep2View = Em.View.extend({ return this.get("controller.content.installOptions.manualInstall"); }.property("controller.content.installOptions.manualInstall"), + sshKeyClass:function() { + return (this.get("isFileApi")) ? "hide" : "" ; + }.property("isFileApi"), + isFileApi: function () { return (window.File && window.FileReader && window.FileList) ? true : false ; }.property(), + sshKeyPreviewClass: function() { + if (this.get('controller.content.installOptions.sshKey').trim() != '') { + if (this.get('controller.content.installOptions.manualInstall')) { + return 'sshKey-file-view disabled'; + } else { + return 'sshKey-file-view'; + } + } else { + return 'hidden'; + } + }.property('controller.content.installOptions.sshKey', 'controller.content.installOptions.manualInstall'), + manualInstallPopup: function(){ if(!this.get('controller.content.installOptions.useSsh')){ App.ModalPopup.show({ @@ -97,35 +165,8 @@ App.WizardStep2View = Em.View.extend({ }); } this.set('controller.content.installOptions.manualInstall', !this.get('controller.content.installOptions.useSsh')); - }.observes('controller.content.installOptions.useSsh'), + }.observes('controller.content.installOptions.useSsh') - providingSSHKeyRadioButton: Ember.Checkbox.extend({ - tagName: 'input', - attributeBindings: ['type', 'checked'], - checked: function () { - return this.get('controller.content.installOptions.useSsh'); - }.property('controller.content.installOptions.useSsh'), - type: 'radio', - - click: function () { - this.set('controller.content.installOptions.useSsh', true); - this.set('controller.content.installOptions.manualInstall', false); - } - }), - - manualRegistrationRadioButton: Ember.Checkbox.extend({ - tagName: 'input', - attributeBindings: ['type', 'checked'], - checked: function () { - return this.get('controller.content.installOptions.manualInstall'); - }.property('controller.content.installOptions.manualInstall'), - type: 'radio', - - click: function () { - this.set('controller.content.installOptions.manualInstall', true); - this.set('controller.content.installOptions.useSsh', false); - } - }) }); Modified: incubator/ambari/branches/branch-1.2/contrib/ambari-log4j/src/main/java/org/apache/ambari/log4j/hadoop/mapreduce/jobhistory/MapReduceJobHistoryUpdater.java URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/contrib/ambari-log4j/src/main/java/org/apache/ambari/log4j/hadoop/mapreduce/jobhistory/MapReduceJobHistoryUpdater.java?rev=1432332&r1=1432331&r2=1432332&view=diff ============================================================================== --- incubator/ambari/branches/branch-1.2/contrib/ambari-log4j/src/main/java/org/apache/ambari/log4j/hadoop/mapreduce/jobhistory/MapReduceJobHistoryUpdater.java (original) +++ incubator/ambari/branches/branch-1.2/contrib/ambari-log4j/src/main/java/org/apache/ambari/log4j/hadoop/mapreduce/jobhistory/MapReduceJobHistoryUpdater.java Fri Jan 11 23:41:06 2013 @@ -23,12 +23,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.util.HashMap; -import java.util.List; import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.TreeMap; -import java.util.TreeSet; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -132,7 +127,7 @@ public class MapReduceJobHistoryUpdater workflowSelectPS = connection.prepareStatement( - "SELECT workflowContext FROM " + WORKFLOW_TABLE + " where workflowId = ?" + "SELECT workflowId FROM " + WORKFLOW_TABLE + " where workflowId = ?" ); workflowPS = @@ -159,8 +154,6 @@ public class MapReduceJobHistoryUpdater "UPDATE " + WORKFLOW_TABLE + " SET " + - "workflowContext = ?, " + - "numJobsTotal = ?, " + "lastUpdateTime = ?, " + "duration = ? - (SELECT startTime FROM " + WORKFLOW_TABLE + @@ -604,57 +597,6 @@ public class MapReduceJobHistoryUpdater return context; } - public static void mergeEntries(Map> edges, List entries) { - if (entries == null) - return; - for (WorkflowDagEntry entry : entries) { - if (!edges.containsKey(entry.getSource())) - edges.put(entry.getSource(), new TreeSet()); - Set targets = edges.get(entry.getSource()); - targets.addAll(entry.getTargets()); - } - } - - public static WorkflowDag constructMergedDag(WorkflowContext workflowContext, WorkflowContext existingWorkflowContext) { - Map> edges = new TreeMap>(); - if (existingWorkflowContext.getWorkflowDag() != null) - mergeEntries(edges, existingWorkflowContext.getWorkflowDag().getEntries()); - if (workflowContext.getWorkflowDag() != null) - mergeEntries(edges, workflowContext.getWorkflowDag().getEntries()); - WorkflowDag mergedDag = new WorkflowDag(); - for (Entry> edge : edges.entrySet()) { - WorkflowDagEntry entry = new WorkflowDagEntry(); - entry.setSource(edge.getKey()); - entry.getTargets().addAll(edge.getValue()); - mergedDag.addEntry(entry); - } - return mergedDag; - } - - private static WorkflowContext getSanitizedWorkflow(WorkflowContext workflowContext, WorkflowContext existingWorkflowContext) { - WorkflowContext sanitizedWC = new WorkflowContext(); - if (existingWorkflowContext == null) { - sanitizedWC.setWorkflowDag(workflowContext.getWorkflowDag()); - sanitizedWC.setParentWorkflowContext(workflowContext.getParentWorkflowContext()); - } else { - sanitizedWC.setWorkflowDag(constructMergedDag(existingWorkflowContext, workflowContext)); - sanitizedWC.setParentWorkflowContext(existingWorkflowContext.getParentWorkflowContext()); - } - return sanitizedWC; - } - - private static String getWorkflowString(WorkflowContext sanitizedWC) { - String sanitizedWCString = null; - try { - ObjectMapper om = new ObjectMapper(); - sanitizedWCString = om.writeValueAsString(sanitizedWC); - } catch (IOException e) { - e.printStackTrace(); - sanitizedWCString = ""; - } - return sanitizedWCString; - } - private void processJobSubmittedEvent( PreparedStatement jobPS, PreparedStatement workflowSelectPS, PreparedStatement workflowPS, @@ -674,35 +616,35 @@ public class MapReduceJobHistoryUpdater // Get workflow information boolean insertWorkflow = false; - String existingContextString = null; - ResultSet rs = null; try { workflowSelectPS.setString(1, workflowContext.getWorkflowId()); workflowSelectPS.execute(); - rs = workflowSelectPS.getResultSet(); - if (rs.next()) { - existingContextString = rs.getString(1); - } else { - insertWorkflow = true; - } + ResultSet rs = workflowSelectPS.getResultSet(); + insertWorkflow = !rs.next(); } catch (SQLException sqle) { LOG.warn("workflow select failed with: ", sqle); insertWorkflow = false; - } finally { - try { - if (rs != null) - rs.close(); - } catch (SQLException e) { - LOG.error("Exception while closing ResultSet", e); - } } // Insert workflow if (insertWorkflow) { + WorkflowContext sanitizedWC = new WorkflowContext(); + sanitizedWC.setWorkflowDag(workflowContext.getWorkflowDag()); + sanitizedWC.setParentWorkflowContext(workflowContext.getParentWorkflowContext()); + + String sanitizedWCString = null; + try { + ObjectMapper om = new ObjectMapper(); + sanitizedWCString = om.writeValueAsString(sanitizedWC); + } catch (IOException e) { + e.printStackTrace(); + sanitizedWCString = ""; + } + workflowPS.setString(1, workflowContext.getWorkflowId()); workflowPS.setString(2, workflowContext.getWorkflowName()); - workflowPS.setString(3, getWorkflowString(getSanitizedWorkflow(workflowContext, null))); + workflowPS.setString(3, sanitizedWCString); workflowPS.setString(4, historyEvent.getUserName()); workflowPS.setLong(5, historyEvent.getSubmitTime()); workflowPS.setLong(6, historyEvent.getSubmitTime()); @@ -711,22 +653,10 @@ public class MapReduceJobHistoryUpdater LOG.debug("Successfully inserted workflowId = " + workflowContext.getWorkflowId()); } else { - ObjectMapper om = new ObjectMapper(); - WorkflowContext existingWorkflowContext = null; - try { - if (existingContextString != null) - existingWorkflowContext = om.readValue(existingContextString.getBytes(), WorkflowContext.class); - } catch (IOException e) { - LOG.warn("Couldn't read existing workflow context for " + workflowContext.getWorkflowId(), e); - } - - WorkflowContext sanitizedWC = getSanitizedWorkflow(workflowContext, existingWorkflowContext); - workflowUpdateTimePS.setString(1, getWorkflowString(sanitizedWC)); - workflowUpdateTimePS.setLong(2, sanitizedWC.getWorkflowDag().size()); - workflowUpdateTimePS.setLong(3, historyEvent.getSubmitTime()); - workflowUpdateTimePS.setLong(4, historyEvent.getSubmitTime()); - workflowUpdateTimePS.setString(5, workflowContext.getWorkflowId()); - workflowUpdateTimePS.setString(6, workflowContext.getWorkflowId()); + workflowUpdateTimePS.setLong(1, historyEvent.getSubmitTime()); + workflowUpdateTimePS.setLong(2, historyEvent.getSubmitTime()); + workflowUpdateTimePS.setString(3, workflowContext.getWorkflowId()); + workflowUpdateTimePS.setString(4, workflowContext.getWorkflowId()); workflowUpdateTimePS.executeUpdate(); LOG.debug("Successfully updated workflowId = " + workflowContext.getWorkflowId()); Modified: incubator/ambari/branches/branch-1.2/contrib/ambari-log4j/src/test/java/org/apache/ambari/TestJobHistoryParsing.java URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2/contrib/ambari-log4j/src/test/java/org/apache/ambari/TestJobHistoryParsing.java?rev=1432332&r1=1432331&r2=1432332&view=diff ============================================================================== --- incubator/ambari/branches/branch-1.2/contrib/ambari-log4j/src/test/java/org/apache/ambari/TestJobHistoryParsing.java (original) +++ incubator/ambari/branches/branch-1.2/contrib/ambari-log4j/src/test/java/org/apache/ambari/TestJobHistoryParsing.java Fri Jan 11 23:41:06 2013 @@ -30,7 +30,6 @@ import org.apache.ambari.eventdb.model.W import org.apache.ambari.log4j.hadoop.mapreduce.jobhistory.MapReduceJobHistoryUpdater; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapred.JobHistory; -import org.apache.hadoop.mapreduce.JobID; import org.apache.hadoop.tools.rumen.JobSubmittedEvent; import org.apache.hadoop.util.StringUtils; @@ -66,42 +65,20 @@ public class TestJobHistoryParsing exten test("id_= 0-1", "something.name", "1=0", adj); } - public void test3() { - String s = "`~!@#$%^&*()-_=+[]{}|,.<>/?;:'\""; - test(s, s, s, new HashMap()); - } - - public void test4() { - Map adj = new HashMap(); - adj.put("X", new String[] {}); - test("", "jobName", "X", adj); - } - public void test(String workflowId, String workflowName, String workflowNodeName, Map adjacencies) { Configuration conf = new Configuration(); setProperties(conf, workflowId, workflowName, workflowNodeName, adjacencies); String log = log("JOB", new String[] {ID, NAME, NODE, ADJ}, new String[] {conf.get(ID_PROP), conf.get(NAME_PROP), conf.get(NODE_PROP), JobHistory.JobInfo.getWorkflowAdjacencies(conf)}); ParsedLine line = new ParsedLine(log); - JobID jobid = new JobID("id", 1); - JobSubmittedEvent event = new JobSubmittedEvent(jobid, workflowName, "", 0l, "", null, "", line.get(ID), line.get(NAME), line.get(NODE), line.get(ADJ)); + JobSubmittedEvent event = new JobSubmittedEvent(null, "", "", 0l, "", null, "", line.get(ID), line.get(NAME), line.get(NODE), line.get(ADJ)); WorkflowContext context = MapReduceJobHistoryUpdater.buildWorkflowContext(event); - - String resultingWorkflowId = workflowId; - if (workflowId.isEmpty()) - resultingWorkflowId = jobid.toString().replace("job_", "mr_"); - assertEquals("Didn't recover workflowId", resultingWorkflowId, context.getWorkflowId()); + assertEquals("Didn't recover workflowId", workflowId, context.getWorkflowId()); assertEquals("Didn't recover workflowName", workflowName, context.getWorkflowName()); assertEquals("Didn't recover workflowNodeName", workflowNodeName, context.getWorkflowEntityName()); - - Map resultingAdjacencies = adjacencies; - if (resultingAdjacencies.size() == 0) { - resultingAdjacencies = new HashMap(); - resultingAdjacencies.put(workflowNodeName, new String[] {}); - } - assertEquals("Got incorrect number of adjacencies", resultingAdjacencies.size(), context.getWorkflowDag().getEntries().size()); + assertEquals("Got incorrect number of adjacencies", adjacencies.size(), context.getWorkflowDag().getEntries().size()); for (WorkflowDagEntry entry : context.getWorkflowDag().getEntries()) { - String[] sTargets = resultingAdjacencies.get(entry.getSource()); + String[] sTargets = adjacencies.get(entry.getSource()); assertNotNull("No original targets for " + entry.getSource(), sTargets); List dTargets = entry.getTargets(); assertEquals("Got incorrect number of targets for " + entry.getSource(), sTargets.length, dTargets.size());

{{t installer.step2.sshKey}}