eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-23 14:08:40 +00:00
Code Activity

bug5849: completed passing through of MongoDB archiving error message

Browse Source
This commit is contained in:
Axel Uhl
2023-06-12 13:15:21 +02:00
parent 869647ebcf
commit feb9efceaa
4 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.landscape.ui/src/com/sap/sailing/landscape/ui/client/LandscapeManagementPanel.java
+3 -4
View File
@@ -1028,16 +1028,15 @@ public class LandscapeManagementPanel extends SimplePanel {
sshKeyManagementPanel.getSelectedKeyPair()==null?null:sshKeyManagementPanel.getSelectedKeyPair().getName(),
sshKeyManagementPanel.getPassphraseForPrivateKeyDecryption() != null
? sshKeyManagementPanel.getPassphraseForPrivateKeyDecryption().getBytes() : null,
new AsyncCallback<Util.Pair<SailingApplicationReplicaSetDTO<String>, String>>() {
new AsyncCallback<String>() {
@Override
public void onFailure(Throwable caught) {
applicationReplicaSetActionChainingCallback.onFailure(caught);
}
@Override
public void onSuccess(Util.Pair<SailingApplicationReplicaSetDTO<String>, String> result) {
applicationReplicaSetActionChainingCallback.onSuccess(result.getA());
final String mongoDbArchivingErrorMessage = result.getB();
public void onSuccess(String mongoDbArchivingErrorMessage) {
applicationReplicaSetActionChainingCallback.onSuccess(/* application replica set (removed) */ null);
if (mongoDbArchivingErrorMessage != null) {
errorReporter.reportError(stringMessages.errorArchivingMongoDBTo(
selectedMongoEndpointForDBArchiving.getReplicaSetName(), mongoDbArchivingErrorMessage));
java/com.sap.sailing.landscape.ui/src/com/sap/sailing/landscape/ui/client/LandscapeManagementWriteService.java
+1 -2
View File
@@ -18,7 +18,6 @@ import com.sap.sailing.landscape.ui.shared.SSHKeyPairDTO;
import com.sap.sailing.landscape.ui.shared.SailingApplicationReplicaSetDTO;
import com.sap.sailing.landscape.ui.shared.SerializationDummyDTO;
import com.sap.sse.common.Duration;
import com.sap.sse.common.Util.Pair;
import com.sap.sse.common.Util.Triple;
import com.sap.sse.landscape.aws.common.shared.RedirectDTO;
@@ -85,7 +84,7 @@ public interface LandscapeManagementWriteService extends RemoteService {
void defineDefaultRedirect(String regionId, String hostname, RedirectDTO redirect, String keyName, String passphraseForPrivateKeyDecryption);
Pair<SailingApplicationReplicaSetDTO<String>, String> removeApplicationReplicaSet(String regionId,
String removeApplicationReplicaSet(String regionId,
SailingApplicationReplicaSetDTO<String> applicationReplicaSetToRemove, MongoEndpointDTO moveDatabaseHere,
String optionalKeyName, byte[] passphraseForPrivateKeyDescryption) throws Exception;
java/com.sap.sailing.landscape.ui/src/com/sap/sailing/landscape/ui/client/LandscapeManagementWriteServiceAsync.java
+1 -2
View File
@@ -21,7 +21,6 @@ import com.sap.sailing.landscape.ui.shared.SSHKeyPairDTO;
import com.sap.sailing.landscape.ui.shared.SailingApplicationReplicaSetDTO;
import com.sap.sailing.landscape.ui.shared.SerializationDummyDTO;
import com.sap.sse.common.Duration;
import com.sap.sse.common.Util.Pair;
import com.sap.sse.common.Util.Triple;
import com.sap.sse.landscape.aws.common.shared.RedirectDTO;
@@ -119,7 +118,7 @@ public interface LandscapeManagementWriteServiceAsync {
void removeApplicationReplicaSet(String regionId,
SailingApplicationReplicaSetDTO<String> applicationReplicaSetToRemove, MongoEndpointDTO moveDatabaseHere,
String optionalKeyName, byte[] passphraseForPrivateKeyDescryption, AsyncCallback<Pair<SailingApplicationReplicaSetDTO<String>, String>> callback);
String optionalKeyName, byte[] passphraseForPrivateKeyDescryption, AsyncCallback<String> callback);
void createDefaultLoadBalancerMappings(String regionId,
SailingApplicationReplicaSetDTO<String> applicationReplicaSetToCreateLoadBalancerMappingFor,
java/com.sap.sailing.landscape.ui/src/com/sap/sailing/landscape/ui/server/LandscapeManagementWriteServiceImpl.java
+2 -2
View File
@@ -651,7 +651,7 @@ public class LandscapeManagementWriteServiceImpl extends ResultCachingProxiedRem
}
@Override
public Pair<SailingApplicationReplicaSetDTO<String>, String> removeApplicationReplicaSet(String regionId,
public String removeApplicationReplicaSet(String regionId,
SailingApplicationReplicaSetDTO<String> applicationReplicaSetToRemove, MongoEndpointDTO moveDatabaseHere,
String optionalKeyName, byte[] passphraseForPrivateKeyDecryption)
throws Exception {
@@ -661,7 +661,7 @@ public class LandscapeManagementWriteServiceImpl extends ResultCachingProxiedRem
final String mongoDbArchivingErrorMessage = getLandscapeService().removeApplicationReplicaSet(regionId, convertFromApplicationReplicaSetDTO(
new AwsRegion(regionId, getLandscape()), applicationReplicaSetToRemove), getMongoEndpoint(moveDatabaseHere),
optionalKeyName, passphraseForPrivateKeyDecryption);
return new Pair<>(applicationReplicaSetToRemove, mongoDbArchivingErrorMessage);
return mongoDbArchivingErrorMessage;
}
private AwsApplicationReplicaSet<String, SailingAnalyticsMetrics, SailingAnalyticsProcess<String>> convertFromApplicationReplicaSetDTO(