ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Improve Agent performance (#3804)

Browse Source 
* pause and resume job history retrieval when opening dialogs

* review comments

* removed boolean for tab change
This commit is contained in:
Aditya Bist
2019-01-23 14:25:54 -08:00
committed by GitHub
parent 4ad059605c
commit f611cf3b5a
3 changed files with 37 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/sql/parts/jobManagement/views/jobHistory.component.ts
View File

@@ -177,7 +177,9 @@ export class JobHistoryComponent extends JobManagementView implements OnInit {
} else { } else {
self._showPreviousRuns = false; self._showPreviousRuns = false;
self._showSteps = false; self._showSteps = false;
self._cd.detectChanges(); if (self._agentViewComponent.showHistory) {
self._cd.detectChanges();
}
} }
}); });
} }
@@ -209,7 +211,9 @@ export class JobHistoryComponent extends JobManagementView implements OnInit {
} else { } else {
self._showSteps = false; self._showSteps = false;
} }
self._cd.detectChanges(); if (self._agentViewComponent.showHistory) {
self._cd.detectChanges();
}
} }
} }

2
src/sql/parts/jobManagement/views/jobHistory.css
View File

@@ -262,7 +262,7 @@ jobhistory-component {
} }
jobhistory-component > .jobhistory-heading-container { jobhistory-component > .jobhistory-heading-container {
display: inline-block; display: flex;
} }
jobhistory-component > .jobhistory-heading-container > .icon.in-progress { jobhistory-component > .jobhistory-heading-container > .icon.in-progress {

70
src/sql/parts/jobManagement/views/jobsView.component.ts
View File

@@ -94,8 +94,6 @@ export class JobsViewComponent extends JobManagementView implements OnInit, OnDe
private jobSchedules: { [jobId: string]: sqlops.AgentJobScheduleInfo[]; } = Object.create(null); private jobSchedules: { [jobId: string]: sqlops.AgentJobScheduleInfo[]; } = Object.create(null);
public contextAction = NewJobAction; public contextAction = NewJobAction;
private _didTabChange: boolean;
@ViewChild('jobsgrid') _gridEl: ElementRef; @ViewChild('jobsgrid') _gridEl: ElementRef;
constructor( constructor(
@@ -113,7 +111,6 @@ export class JobsViewComponent extends JobManagementView implements OnInit, OnDe
@Inject(ITelemetryService) private _telemetryService: ITelemetryService @Inject(ITelemetryService) private _telemetryService: ITelemetryService
) { ) {
super(commonService, _dashboardService, contextMenuService, keybindingService, instantiationService); super(commonService, _dashboardService, contextMenuService, keybindingService, instantiationService);
this._didTabChange = false;
let jobCacheObjectMap = this._jobManagementService.jobCacheObjectMap; let jobCacheObjectMap = this._jobManagementService.jobCacheObjectMap;
let jobCache = jobCacheObjectMap[this._serverName]; let jobCache = jobCacheObjectMap[this._serverName];
if (jobCache) { if (jobCache) {
@@ -135,7 +132,6 @@ export class JobsViewComponent extends JobManagementView implements OnInit, OnDe
} }
ngOnDestroy() { ngOnDestroy() {
this._didTabChange = true;
} }
public layout() { public layout() {
@@ -220,10 +216,8 @@ export class JobsViewComponent extends JobManagementView implements OnInit, OnDe
} }
this._showProgressWheel = false; this._showProgressWheel = false;
if (this.isVisible && !this._didTabChange) { if (this.isVisible) {
this._cd.detectChanges(); this._cd.detectChanges();
} else if (this._didTabChange) {
return;
} }
}); });
} }
@@ -594,40 +588,36 @@ export class JobsViewComponent extends JobManagementView implements OnInit, OnDe
private async curateJobHistory(jobs: sqlops.AgentJobInfo[], ownerUri: string) { private async curateJobHistory(jobs: sqlops.AgentJobInfo[], ownerUri: string) {
const self = this; const self = this;
await Promise.all(jobs.map(async (job) => { for (let job of jobs) {
await this._jobManagementService.getJobHistory(ownerUri, job.jobId, job.name).then(async(result) => { let result = await this._jobManagementService.getJobHistory(ownerUri, job.jobId, job.name);
if (result) { if (result) {
self.jobSteps[job.jobId] = result.steps ? result.steps : []; self.jobSteps[job.jobId] = result.steps ? result.steps : [];
self.jobAlerts[job.jobId] = result.alerts ? result.alerts : []; self.jobAlerts[job.jobId] = result.alerts ? result.alerts : [];
self.jobSchedules[job.jobId] = result.schedules ? result.schedules : []; self.jobSchedules[job.jobId] = result.schedules ? result.schedules : [];
self.jobHistories[job.jobId] = result.histories ? result.histories : []; self.jobHistories[job.jobId] = result.histories ? result.histories : [];
self._jobCacheObject.setJobSteps(job.jobId, self.jobSteps[job.jobId]); self._jobCacheObject.setJobSteps(job.jobId, self.jobSteps[job.jobId]);
self._jobCacheObject.setJobHistory(job.jobId, self.jobHistories[job.jobId]); self._jobCacheObject.setJobHistory(job.jobId, self.jobHistories[job.jobId]);
self._jobCacheObject.setJobAlerts(job.jobId, self.jobAlerts[job.jobId]); self._jobCacheObject.setJobAlerts(job.jobId, self.jobAlerts[job.jobId]);
self._jobCacheObject.setJobSchedules(job.jobId, self.jobSchedules[job.jobId]); self._jobCacheObject.setJobSchedules(job.jobId, self.jobSchedules[job.jobId]);
let jobHistories = self._jobCacheObject.getJobHistory(job.jobId); let jobHistories = self._jobCacheObject.getJobHistory(job.jobId);
let previousRuns: sqlops.AgentJobHistoryInfo[]; let previousRuns: sqlops.AgentJobHistoryInfo[];
if (jobHistories.length >= 5) { if (jobHistories.length >= 5) {
previousRuns = jobHistories.slice(jobHistories.length - 5, jobHistories.length); previousRuns = jobHistories.slice(jobHistories.length - 5, jobHistories.length);
} else { } else {
previousRuns = jobHistories; previousRuns = jobHistories;
}
// dont create the charts if the tab changed
if (!self._didTabChange) {
self.createJobChart(job.jobId, previousRuns);
}
if (self._agentViewComponent.expanded.has(job.jobId)) {
let lastJobHistory = jobHistories[jobHistories.length - 1];
let item = self.dataView.getItemById(job.jobId + '.error');
let noStepsMessage = nls.localize('jobsView.noSteps', 'No Steps available for this job.');
let errorMessage = lastJobHistory ? lastJobHistory.message : noStepsMessage;
item['name'] = nls.localize('jobsView.error', 'Error: ') + errorMessage;
self._agentViewComponent.setExpanded(job.jobId, item['name']);
self.dataView.updateItem(job.jobId + '.error', item);
}
} }
}); self.createJobChart(job.jobId, previousRuns);
})); if (self._agentViewComponent.expanded.has(job.jobId)) {
let lastJobHistory = jobHistories[jobHistories.length - 1];
let item = self.dataView.getItemById(job.jobId + '.error');
let noStepsMessage = nls.localize('jobsView.noSteps', 'No Steps available for this job.');
let errorMessage = lastJobHistory ? lastJobHistory.message : noStepsMessage;
item['name'] = nls.localize('jobsView.error', 'Error: ') + errorMessage;
self._agentViewComponent.setExpanded(job.jobId, item['name']);
self.dataView.updateItem(job.jobId + '.error', item);
}
}
}
} }
private createJobChart(jobId: string, jobHistories: sqlops.AgentJobHistoryInfo[]): void { private createJobChart(jobId: string, jobHistories: sqlops.AgentJobHistoryInfo[]): void {