Skip to content

Commit 8addb9f

Browse files
committed
Revert "* Add cluster guid in error log area when provision or update cluster failed"
This reverts commit 60c7da7.
1 parent 60c7da7 commit 8addb9f

File tree

7 files changed

+297
-370
lines changed

7 files changed

+297
-370
lines changed

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/sparkserverless/serverexplore/ui/SparkServerlessClusterUpdateDialog.java

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@
2222

2323
package com.microsoft.azure.sparkserverless.serverexplore.ui;
2424

25-
import com.intellij.execution.ui.ConsoleViewContentType;
2625
import com.intellij.openapi.project.Project;
27-
import com.microsoft.azure.hdinsight.common.logger.ILogger;
2826
import com.microsoft.azure.hdinsight.sdk.common.azure.serverless.AzureSparkServerlessCluster;
2927
import com.microsoft.azure.sparkserverless.serverexplore.SparkServerlessClusterProvisionSettingsModel;
3028
import com.microsoft.azure.sparkserverless.serverexplore.SparkServerlessClusterUpdateCtrlProvider;
@@ -36,11 +34,8 @@
3634

3735
import java.awt.event.WindowAdapter;
3836
import java.awt.event.WindowEvent;
39-
import java.time.LocalDateTime;
4037

41-
public class SparkServerlessClusterUpdateDialog extends SparkServerlessProvisionDialog implements ILogger {
42-
@NotNull
43-
private final AzureSparkServerlessCluster cluster;
38+
public class SparkServerlessClusterUpdateDialog extends SparkServerlessProvisionDialog {
4439

4540
private void disableUneditableFields() {
4641
clusterNameField.setEditable(false);
@@ -56,25 +51,29 @@ private void disableUneditableFields() {
5651
private SparkServerlessClusterUpdateCtrlProvider ctrlProvider;
5752
public SparkServerlessClusterUpdateDialog(@NotNull SparkServerlessClusterNode clusterNode,
5853
@NotNull AzureSparkServerlessCluster cluster) {
54+
5955
super((SparkServerlessADLAccountNode) clusterNode.getParent(), cluster.getAccount());
60-
this.cluster = cluster;
6156
this.setTitle("Update Cluster");
6257
disableUneditableFields();
58+
getOKAction().setEnabled(false);
6359
ctrlProvider = new SparkServerlessClusterUpdateCtrlProvider(
6460
this, new IdeaSchedulers((Project)clusterNode.getProject()), cluster);
6561
this.getWindow().addWindowListener(new WindowAdapter() {
6662
@Override
6763
public void windowOpened(WindowEvent e) {
6864
ctrlProvider.initialize()
69-
.subscribe(complete -> {}, err -> log().warn("Error initialize update dialog. " + err.toString()));
65+
.subscribe(complete -> {}, err -> {
66+
log().warn(String.format("Can't get the cluster %s details: %s", cluster.getName(), err));
67+
errorMessageField.setText("Error Loading cluster details");
68+
});
7069
super.windowOpened(e);
7170
}
7271
});
7372
}
7473

7574

7675
@Override
77-
protected void enableClusterNameUniquenessCheck() {
76+
protected void setClusterNameSets() {
7877
// To avoid cluster already exists tooltips
7978
clusterNameField.setNotAllowedValues(null);
8079

@@ -113,13 +112,6 @@ public void setData(@NotNull SparkServerlessClusterProvisionSettingsModel data)
113112
workerMemoryField.setText(String.valueOf(data.getWorkerMemory()));
114113
workerNumberOfContainersField.setText(String.valueOf(data.getWorkerNumberOfContainers()));
115114

116-
if (!StringUtils.isEmpty(data.getErrorMessage())) {
117-
if (!errorMessageDecorator.isExpanded()) {
118-
errorMessageDecorator.setOn(true);
119-
}
120-
121-
printLogLine(ConsoleViewContentType.ERROR_OUTPUT, data.getErrorMessage());
122-
}
123-
printLogLine(ConsoleViewContentType.NORMAL_OUTPUT, "Cluster guid: " + cluster.getGuid());
115+
errorMessageField.setText(data.getErrorMessage());
124116
}
125117
}

0 commit comments

Comments
 (0)