maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[Code] adjust the orders of delete steps to avoid long lang server initialization stage (#43893)

Browse source
This commit is contained in:
Mengwei Ding 2019-08-26 14:13:05 -07:00 committed by GitHub
parent 9966abddc4
commit f8128b99e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
x-pack/legacy/plugins/code/server/queue/delete_worker.ts
View file

@ -41,45 +41,45 @@ export class DeleteWorker extends AbstractWorker {
public async executeJob(job: Job) {
const { uri } = job.payload;
// 1. Cancel running workers
await this.cancellationService.cancelCloneJob(uri, CancellationReason.REPOSITORY_DELETE);
await this.cancellationService.cancelUpdateJob(uri, CancellationReason.REPOSITORY_DELETE);
await this.cancellationService.cancelIndexJob(uri, CancellationReason.REPOSITORY_DELETE);
// 2. Delete git repository and all related data.
const repoService = this.repoServiceFactory.newInstance(
this.serverOptions.repoPath,
this.serverOptions.credsPath,
this.log,
this.serverOptions.security.enableGitCertCheck
);
const deleteWorkspacePromise = this.deletePromiseWrapper(
this.lspService.deleteWorkspace(uri),
'workspace',
uri
);
// 3. Delete ES indices and aliases
const deleteSymbolESIndexPromise = this.deletePromiseWrapper(
this.client.indices.delete({ index: `${SymbolIndexName(uri)}*` }),
'symbol ES index',
uri
);
const deleteReferenceESIndexPromise = this.deletePromiseWrapper(
this.client.indices.delete({ index: `${ReferenceIndexName(uri)}*` }),
'reference ES index',
uri
);
try {
await Promise.all([
deleteWorkspacePromise,
deleteSymbolESIndexPromise,
deleteReferenceESIndexPromise,
]);
// 1. Cancel running clone and update workers
await this.cancellationService.cancelCloneJob(uri, CancellationReason.REPOSITORY_DELETE);
await this.cancellationService.cancelUpdateJob(uri, CancellationReason.REPOSITORY_DELETE);
// 2. Delete workspace and index workers. Since the indexing could be
// hanging in the initialization stage, we should delete the workspace
// to cancel it in the meantime.
const deleteWorkspacePromise = this.deletePromiseWrapper(
this.lspService.deleteWorkspace(uri),
'workspace',
uri
);
const indexJobCancelPromise = this.cancellationService.cancelIndexJob(
uri,
CancellationReason.REPOSITORY_DELETE
);
await Promise.all([deleteWorkspacePromise, indexJobCancelPromise]);
// 3. Delete ES indices and aliases
const deleteSymbolESIndexPromise = this.deletePromiseWrapper(
this.client.indices.delete({ index: `${SymbolIndexName(uri)}*` }),
'symbol ES index',
uri
);
const deleteReferenceESIndexPromise = this.deletePromiseWrapper(
this.client.indices.delete({ index: `${ReferenceIndexName(uri)}*` }),
'reference ES index',
uri
);
await Promise.all([deleteSymbolESIndexPromise, deleteReferenceESIndexPromise]);
const repoService = this.repoServiceFactory.newInstance(
this.serverOptions.repoPath,
this.serverOptions.credsPath,
this.log,
this.serverOptions.security.enableGitCertCheck
);
this.gitOps.cleanRepo(uri);
await this.deletePromiseWrapper(repoService.remove(uri), 'git data', uri);