eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-25 06:58:39 +00:00
Code Activity

Merge branch 'master' of ssh://sapsailing.com/home/trac/git into bug5929

Browse Source
This commit is contained in:
Thomas G Stokes
2023-12-05 23:42:13 +01:00
parent 28411912a9 c6da99626f
commit 66b999329e
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sse.landscape.aws/src/com/sap/sse/landscape/aws/impl/AwsLandscapeImpl.java
+2 -1
View File
@@ -93,6 +93,7 @@ import software.amazon.awssdk.services.acm.model.CertificateStatus;
import software.amazon.awssdk.services.autoscaling.AutoScalingAsyncClient;
import software.amazon.awssdk.services.autoscaling.AutoScalingClient;
import software.amazon.awssdk.services.autoscaling.model.AutoScalingGroup;
import software.amazon.awssdk.services.autoscaling.model.BlockDeviceMapping;
import software.amazon.awssdk.services.autoscaling.model.CreateLaunchConfigurationRequest;
import software.amazon.awssdk.services.autoscaling.model.DeleteAutoScalingGroupResponse;
import software.amazon.awssdk.services.autoscaling.model.EnableMetricsCollectionRequest;
@@ -1874,7 +1875,7 @@ public class AwsLandscapeImpl<ShardingKey> implements AwsLandscape<ShardingKey>
private CreateLaunchConfigurationRequest.Builder copyLaunchConfigurationToCreateRequestBuilder(LaunchConfiguration launchConfigurationToCopy) {
return CreateLaunchConfigurationRequest.builder()
.associatePublicIpAddress(launchConfigurationToCopy.associatePublicIpAddress())
.blockDeviceMappings(launchConfigurationToCopy.blockDeviceMappings())
.blockDeviceMappings(new BlockDeviceMapping[0]) // empty the block device mappings, forcing AMI device mappings to be used
.classicLinkVPCId(launchConfigurationToCopy.classicLinkVPCId())
.classicLinkVPCSecurityGroups(launchConfigurationToCopy.classicLinkVPCSecurityGroups())
.ebsOptimized(launchConfigurationToCopy.ebsOptimized())
java/target/stop
+2 -2
View File
@@ -44,7 +44,7 @@ echo "Server process $SERVER_PID didn't die within ${KILL_TIMEOUT_IN_SECONDS}s a
kill $SERVER_PID
TIMEOUT_FOR_KILLED_PROCESS_TO_DISAPPEAR=120
seconds_counter=$TIMEOUT_FOR_KILLED_PROCESS_TO_DISAPPEAR
echo "Waiting up to $TIMEOUT_FOR_KILLED_PROCESS_TO_DISAPPEAR for server process $SERVER_PID to disappear..."
echo "Waiting up to ${TIMEOUT_FOR_KILLED_PROCESS_TO_DISAPPEAR}s for server process $SERVER_PID to disappear..."
while ((seconds_counter-- != 0)); do
if [ ! -d /proc/$SERVER_PID ]; then
echo "Server process $SERVER_PID disappeared after killing it. This took $(($TIMEOUT_FOR_KILLED_PROCESS_TO_DISAPPEAR-$seconds_counter))s."
@@ -56,7 +56,7 @@ done
echo "Server process $SERVER_PID did not die or disappear after SIGTERM. Trying SIGKILL..."
kill -9 $SERVER_PID
seconds_counter=$TIMEOUT_FOR_KILLED_PROCESS_TO_DISAPPEAR
echo "Waiting up to $TIMEOUT_FOR_KILLED_PROCESS_TO_DISAPPEAR for server process $SERVER_PID to disappear after kill -SIGKILL..."
echo "Waiting up to ${TIMEOUT_FOR_KILLED_PROCESS_TO_DISAPPEAR}s for server process $SERVER_PID to disappear after kill -SIGKILL..."
while ((seconds_counter-- != 0)); do
if [ ! -d /proc/$SERVER_PID ]; then
echo "Server process $SERVER_PID disappeared after killing it with SIGKILL. This took $(($TIMEOUT_FOR_KILLED_PROCESS_TO_DISAPPEAR-$seconds_counter))s."