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

Postgres Parameters edit calls missing try catch block (#14805)

Browse Source 
* try catch block within save and reset functions

* pr fix

* Pr fix sessions

* Pr changes
This commit is contained in:
nasc17
2021-03-19 17:25:48 -07:00
committed by GitHub
parent a5d2870344
commit 2086ca6039
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/arc/src/ui/dashboards/postgres/postgresCoordinatorNodeParametersPage.ts
View File

@@ -35,7 +35,7 @@ export class PostgresCoordinatorNodeParametersPage extends PostgresParametersPag
/* TODO add correct azdata call for editing coordinator parameters /* TODO add correct azdata call for editing coordinator parameters
await this._azdataApi.azdata.arc.postgres.server.edit( await this._azdataApi.azdata.arc.postgres.server.edit(
this._postgresModel.info.name, this._postgresModel.info.name,
{ engineSettings: engineSettings.toString() }, { engineSettings: engineSettings },
this._postgresModel.engineVersion, this._postgresModel.engineVersion,
this._postgresModel.controllerModel.azdataAdditionalEnvVars, this._postgresModel.controllerModel.azdataAdditionalEnvVars,
session); session);

22
extensions/arc/src/ui/dashboards/postgres/postgresParameters.ts
View File

@@ -153,7 +153,7 @@ export abstract class PostgresParametersPage extends DashboardPage {
}); });
const session = await this._postgresModel.controllerModel.acquireAzdataSession(); const session = await this._postgresModel.controllerModel.acquireAzdataSession();
try { try {
this.saveParameterEdits(engineSettings.toString(), session); await this.saveParameterEdits(engineSettings.toString(), session);
} finally { } finally {
session.dispose(); session.dispose();
} }
@@ -163,6 +163,7 @@ export abstract class PostgresParametersPage extends DashboardPage {
this.saveButton!.enabled = true; this.saveButton!.enabled = true;
throw err; throw err;
} }
await this._postgresModel.refresh(); await this._postgresModel.refresh();
} }
); );
@@ -221,9 +222,13 @@ export abstract class PostgresParametersPage extends DashboardPage {
cancellable: false cancellable: false
}, },
async (_progress, _token): Promise<void> => { async (_progress, _token): Promise<void> => {
const session = await this._postgresModel.controllerModel.acquireAzdataSession();
try { try {
this.resetAllParameters(session); const session = await this._postgresModel.controllerModel.acquireAzdataSession();
try {
await this.resetAllParameters(session);
} finally {
session.dispose();
}
} catch (err) { } catch (err) {
// If an error occurs while resetting the instance then re-enable the reset button since // If an error occurs while resetting the instance then re-enable the reset button since
// the edit wasn't successfully applied // the edit wasn't successfully applied
@@ -233,12 +238,9 @@ export abstract class PostgresParametersPage extends DashboardPage {
} }
this.resetAllButton!.enabled = true; this.resetAllButton!.enabled = true;
throw err; throw err;
} finally {
session?.dispose();
} }
await this._postgresModel.refresh(); await this._postgresModel.refresh();
} }
); );
vscode.window.showInformationMessage(loc.instanceUpdated(this._postgresModel.info.name)); vscode.window.showInformationMessage(loc.instanceUpdated(this._postgresModel.info.name));
@@ -518,7 +520,7 @@ export abstract class PostgresParametersPage extends DashboardPage {
async (_progress, _token): Promise<void> => { async (_progress, _token): Promise<void> => {
const session = await this._postgresModel.controllerModel.acquireAzdataSession(); const session = await this._postgresModel.controllerModel.acquireAzdataSession();
try { try {
this.resetParameter(engineSetting.parameterName!, session); await this.resetParameter(engineSetting.parameterName!, session);
} finally { } finally {
session.dispose(); session.dispose();
} }
@@ -543,11 +545,11 @@ export abstract class PostgresParametersPage extends DashboardPage {
return parameter; return parameter;
} }
protected abstract saveParameterEdits(engineSettings: string, session: azdataExt.AzdataSession): void; protected abstract saveParameterEdits(engineSettings: string, session: azdataExt.AzdataSession): Promise<void>;
protected abstract resetAllParameters(session: azdataExt.AzdataSession): void; protected abstract resetAllParameters(session: azdataExt.AzdataSession): Promise<void>;
protected abstract resetParameter(parameterName: string, session: azdataExt.AzdataSession): void; protected abstract resetParameter(parameterName: string, session: azdataExt.AzdataSession): Promise<void>;
protected abstract refreshParametersTable(): void; protected abstract refreshParametersTable(): void;

3
extensions/arc/src/ui/dashboards/postgres/postgresWorkerNodeParametersPage.ts
View File

@@ -42,7 +42,6 @@ export class PostgresWorkerNodeParametersPage extends PostgresParametersPage {
this._postgresModel.engineVersion, this._postgresModel.engineVersion,
this._postgresModel.controllerModel.azdataAdditionalEnvVars, this._postgresModel.controllerModel.azdataAdditionalEnvVars,
session); session);
} }
protected async resetAllParameters(session: azdataExt.AzdataSession): Promise<void> { protected async resetAllParameters(session: azdataExt.AzdataSession): Promise<void> {
@@ -52,7 +51,6 @@ export class PostgresWorkerNodeParametersPage extends PostgresParametersPage {
this._postgresModel.engineVersion, this._postgresModel.engineVersion,
this._postgresModel.controllerModel.azdataAdditionalEnvVars, this._postgresModel.controllerModel.azdataAdditionalEnvVars,
session); session);
} }
protected async resetParameter(parameterName: string, session: azdataExt.AzdataSession): Promise<void> { protected async resetParameter(parameterName: string, session: azdataExt.AzdataSession): Promise<void> {
@@ -62,7 +60,6 @@ export class PostgresWorkerNodeParametersPage extends PostgresParametersPage {
this._postgresModel.engineVersion, this._postgresModel.engineVersion,
this._postgresModel.controllerModel.azdataAdditionalEnvVars, this._postgresModel.controllerModel.azdataAdditionalEnvVars,
session); session);
} }
protected refreshParametersTable(): void { protected refreshParametersTable(): void {