ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix #6576 Spark job submit fails from command palette (#6580)

Browse Source 
- Fix spark job failing when 1 or more servers are connected
and listed in getActiveConnections
- If nothing is connected, prompts to choose a server
- Added option to dropdown when 1 or more server is connected
to support picking a different connection

Root bug was trying to access "host" not "server" in options bag, which no longer exists.
This commit is contained in:
Kevin Cunnane
2019-08-05 15:48:14 -07:00
committed by GitHub
parent 0da17ee7e1
commit 2431bb8e37
1 changed files with 46 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
extensions/mssql/src/sparkFeature/dialog/dialogCommands.ts
View File

@@ -21,6 +21,12 @@ import * as LocalizedConstants from '../../localizedConstants';
import * as SqlClusterLookUp from '../../sqlClusterLookUp'; import * as SqlClusterLookUp from '../../sqlClusterLookUp';
import { SqlClusterConnection } from '../../objectExplorerNodeProvider/connection'; import { SqlClusterConnection } from '../../objectExplorerNodeProvider/connection';
interface MssqlOptions {
server: string;
}
const timeout = (millis: number) => new Promise(c => setTimeout(c, millis));
export class OpenSparkJobSubmissionDialogCommand extends Command { export class OpenSparkJobSubmissionDialogCommand extends Command {
constructor(appContext: AppContext, private outputChannel: vscode.OutputChannel) { constructor(appContext: AppContext, private outputChannel: vscode.OutputChannel) {
super(constants.mssqlClusterLivySubmitSparkJobCommand, appContext); super(constants.mssqlClusterLivySubmitSparkJobCommand, appContext);
@@ -49,23 +55,51 @@ export class OpenSparkJobSubmissionDialogCommand extends Command {
private async selectConnection(): Promise<SqlClusterConnection> { private async selectConnection(): Promise<SqlClusterConnection> {
let connectionList: azdata.connection.Connection[] = await this.apiWrapper.getActiveConnections(); let connectionList: azdata.connection.Connection[] = await this.apiWrapper.getActiveConnections();
let displayList: string[] = new Array();
let connectionMap: Map<string, azdata.connection.Connection> = new Map(); let connectionMap: Map<string, azdata.connection.Connection> = new Map();
if (connectionList && connectionList.length > 0) { let selectedHost: string = undefined;
connectionList.forEach(conn => { let showConnectionDialog = false;
if (conn.providerName === constants.sqlProviderName) {
displayList.push(conn.options.host);
connectionMap.set(conn.options.host, conn);
}
});
}
let selectedHost: string = await vscode.window.showQuickPick(displayList, { // Filter invalid connections
if (connectionList && connectionList.length > 0) {
connectionList = connectionList.filter(conn => conn.providerName === constants.sqlProviderName && (<MssqlOptions><any>conn.options).server);
}
// Prompt choice if we have active connections
if (connectionList && connectionList.length > 0) {
let selectConnectionMsg = localize('selectOtherServer', "Select other SQL Server");
let displayList: string[] = [];
connectionList.forEach(conn => {
let options: MssqlOptions = <any>conn.options;
displayList.push(options.server);
connectionMap.set(options.server, conn);
});
displayList.push(selectConnectionMsg);
selectedHost = await vscode.window.showQuickPick(displayList, {
placeHolder: placeHolder:
localize('sparkJobSubmission_PleaseSelectSqlWithCluster', localize('sparkJobSubmission_PleaseSelectSqlWithCluster',
"Please select SQL Server with big data cluster.") "Please select SQL Server with big data cluster.")
}); });
let errorMsg = localize('sparkJobSubmission_NoSqlSelected', 'No Sql Server is selected.'); if (selectedHost === selectConnectionMsg) {
showConnectionDialog = true;
selectedHost = undefined;
}
} else {
showConnectionDialog = true;
}
// Show connection dialog if still don't have a server
if (showConnectionDialog) {
let connection = await azdata.connection.openConnectionDialog([constants.sqlProviderName]);
if (connection) {
let options: MssqlOptions = <any>connection.options;
connectionMap.set(options.server, connection);
selectedHost = options.server;
// Wait an appropriate timeout so that the serverInfo object can populate...
await timeout(150);
}
}
let errorMsg = localize('sparkJobSubmission_NoSqlSelected', 'No SQL Server is selected.');
if (!selectedHost) { throw new Error(errorMsg); } if (!selectedHost) { throw new Error(errorMsg); }
let sqlConnection = connectionMap.get(selectedHost); let sqlConnection = connectionMap.get(selectedHost);
@@ -73,7 +107,7 @@ export class OpenSparkJobSubmissionDialogCommand extends Command {
let sqlClusterConnection = await SqlClusterLookUp.getSqlClusterConnection(sqlConnection); let sqlClusterConnection = await SqlClusterLookUp.getSqlClusterConnection(sqlConnection);
if (!sqlClusterConnection) { if (!sqlClusterConnection) {
throw new Error(LocalizedConstants.sparkJobSubmissionNoSqlBigDataClusterFound); throw new Error(localize('errorNotSqlBigDataCluster', "The selected server does not belong to a SQL Server big data cluster"));
} }
return new SqlClusterConnection(sqlClusterConnection); return new SqlClusterConnection(sqlClusterConnection);