eureka-1131: handle spot instance termination #1132
Conversation
| @@ -63,6 +63,8 @@ | |||
| availabilityZone("availability-zone", "placement/"), | |||
| publicHostname("public-hostname"), | |||
| publicIpv4("public-ipv4"), | |||
| spotInstanceTerminationTime("termination-time", "spot/"), | |||
There was a problem hiding this comment.
very minor nit: mind calling this spotTerminationTime? That aligns more with how the rest of the enums are named.
There was a problem hiding this comment.
Sure. Changed to spotTerminationTime.
| @@ -50,7 +50,7 @@ | |||
| }; | |||
|
|
|||
| private final AmazonInfoConfig amazonInfoConfig; | |||
| private final RefreshableAmazonInfoProvider amazonInfoHolder; | |||
| /* visible for testing */ RefreshableAmazonInfoProvider amazonInfoHolder; | |||
There was a problem hiding this comment.
I would appreciate this be kept final to better ensure it is always correctly instantiated. An alternative for your test can be to add a new constructor that can be used to set RefreshableAmazonInfoProvider, with test visibility?
| DataCenterInfo dataCenterInfo = config.getDataCenterInfo(); | ||
| if (dataCenterInfo instanceof AmazonInfo) { | ||
| AmazonInfo amazonInfo = (AmazonInfo) dataCenterInfo; | ||
| String newSpotInstanceAction = amazonInfo.getMetadata().get(AmazonInfo.MetaDataKey.spotInstanceAction.name); |
There was a problem hiding this comment.
It is unfortunate that the API for AmazonInfo is a bit leaky, but the preferred API to extract data is
| existingSpotInstanceAction, | ||
| newSpotInstanceAction)); | ||
| InstanceInfo.Builder builder = new InstanceInfo.Builder(instanceInfo); | ||
| builder.setDataCenterInfo(config.getDataCenterInfo()); |
There was a problem hiding this comment.
There is duplication of code here with code on line 218/219/220, mind consolidating them? Thanks.
| @@ -219,6 +219,21 @@ public void refreshDataCenterInfoIfRequired() { | |||
| builder.setHostName(newAddress).setIPAddr(newIp).setDataCenterInfo(config.getDataCenterInfo()); | |||
| instanceInfo.setIsDirty(); | |||
| } | |||
|
|
|||
| String existingSpotInstanceAction = instanceInfo.getMetadata().get(AmazonInfo.MetaDataKey.spotInstanceAction.name); | |||
There was a problem hiding this comment.
(mostly due to our bad naming) I think this is the wrong metadata map to get here, you want the metadata from the instanceInfo.getDataCenterInfo(), if it is an instance of AmazonInfo.
| AmazonInfo amazonInfo = (AmazonInfo) dataCenterInfo; | ||
| String newSpotInstanceAction = amazonInfo.getMetadata().get(AmazonInfo.MetaDataKey.spotInstanceAction.name); | ||
| if (newSpotInstanceAction != null && !newSpotInstanceAction.equals(existingSpotInstanceAction)) { | ||
| logger.warn(String.format("The spot instance termination action changed from: %s => %s", |
There was a problem hiding this comment.
This is more you use case, is this change worth a WARN level log? Assuming spot termination actions can change often, this'll get noisy.
There was a problem hiding this comment.
I have changed to INFO. If you think that DEBUG is even better here, let me know. In our case, we don't have so much spot-instances termination.
|
@qiangdavidliu thanks for looking into this. I have fixed all comments. |
|
Thanks @krutsko |
No description provided.