Skip to content

Fix: differentiate ADDED and MODIFIED instance actions (#1602) #1604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
souvikree wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −3
Open

Fix: differentiate ADDED and MODIFIED instance actions (#1602) #1604

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions eureka-client/src/main/java/com/netflix/discovery/DiscoveryClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1255,16 +1255,31 @@ private void updateDelta(Applications delta) {
if (existingApp == null) {
applications.addApplication(app);
}
logger.debug("Added instance {} to the existing apps in region {}", instance.getId(), instanceRegion);
applications.getRegisteredApplications(instance.getAppName()).addInstance(instance);
logger.debug("Added instance {} to the existing apps in region {}", instance.getId(), instanceRegion);
} else if (ActionType.MODIFIED.equals(instance.getActionType())) {
Application existingApp = applications.getRegisteredApplications(instance.getAppName());
if (existingApp == null) {
applications.addApplication(app);
} else {
InstanceInfo existingInstance = existingApp.getByInstanceId(instance.getId());
if (existingInstance != null) {
existingInstance.setStatus(instance.getStatus());

// To prevents NullPointerException or any unnecessary map merges
if (instance.getMetadata() != null && !instance.getMetadata().isEmpty()) {
existingInstance.getMetadata().putAll(instance.getMetadata());
}
} else {
existingApp.addInstance(instance);
}
}
logger.debug("Modified instance {} to the existing apps ", instance.getId());
logger.debug("Modified instance {} in the existing apps", instance.getId());

applications.getRegisteredApplications(instance.getAppName()).addInstance(instance);



// applications.getRegisteredApplications(instance.getAppName()).addInstance(instance);

} else if (ActionType.DELETED.equals(instance.getActionType())) {
Application existingApp = applications.getRegisteredApplications(instance.getAppName());
Expand Down