Skip to content
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

Fix WAGED to only use logicalId when computing baseline and centralize picking assignable instances in the cache #2702

Merged
merged 9 commits into from
Nov 28, 2023
Merged

Fix WAGED to only use logicalId when computing baseline and centralize picking assignable instances in the cache #2702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
13a9809
Fix WAGED to only use logicalId when computing baseline and centraliz…
zpinto Nov 21, 2023
a3ef1eb
Remove unnecessary debug logging and refactor add to bestPossibleStat…
zpinto Nov 21, 2023
b517fa0
Address all failing test cases and some fixes for bugs in initial PR.
zpinto Nov 22, 2023
cb1c83b
Fix final set of failing tests and make logic to determine which repl…
zpinto Nov 22, 2023
23b9cdc
Update the methods in REsourceChangeSnapshot.
zpinto Nov 22, 2023
5dfc9da
Fix naming and log statements to make it clear that assignable nodes …
zpinto Nov 22, 2023
a89eefb
Incorporate feedback to only have replica put on swap-in if the swap-…
zpinto Nov 27, 2023
4a78c3c
Replace iterating over live instances to create assignableLiveInstanc…
zpinto Nov 27, 2023
8660f2c
TestInstanceAccessor.getAllInstances was failing because it was using…
zpinto Nov 28, 2023
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
4 changes: 2 additions & 2 deletions ...core/src/main/java/org/apache/helix/controller/changedetector/ResourceChangeDetector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,13 @@ private void clearCachedComputation() {
HelixConstants.ChangeType changeType, ResourceChangeSnapshot snapshot) {
switch (changeType) {
case INSTANCE_CONFIG:
return snapshot.getInstanceConfigMap();
return snapshot.getAssignableInstanceConfigMap();
case IDEAL_STATE:
return snapshot.getIdealStateMap();
case RESOURCE_CONFIG:
return snapshot.getResourceConfigMap();
case LIVE_INSTANCE:
return snapshot.getLiveInstances();
return snapshot.getAssignableLiveInstances();
case CLUSTER_CONFIG:
ClusterConfig config = snapshot.getClusterConfig();
if (config == null) {
Expand Down
41 changes: 30 additions & 11 deletions ...core/src/main/java/org/apache/helix/controller/changedetector/ResourceChangeSnapshot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,21 +50,25 @@
class ResourceChangeSnapshot {

private Set<HelixConstants.ChangeType> _changedTypes;
private Map<String, InstanceConfig> _instanceConfigMap;
private Map<String, InstanceConfig> _allInstanceConfigMap;
private Map<String, InstanceConfig> _assignableInstanceConfigMap;
private Map<String, IdealState> _idealStateMap;
private Map<String, ResourceConfig> _resourceConfigMap;
private Map<String, LiveInstance> _liveInstances;
private Map<String, LiveInstance> _allLiveInstances;
private Map<String, LiveInstance> _assignableLiveInstances;
private ClusterConfig _clusterConfig;

/**
* Default constructor that constructs an empty snapshot.
*/
ResourceChangeSnapshot() {
_changedTypes = new HashSet<>();
_instanceConfigMap = new HashMap<>();
_allInstanceConfigMap = new HashMap<>();
_assignableInstanceConfigMap = new HashMap<>();
_idealStateMap = new HashMap<>();
_resourceConfigMap = new HashMap<>();
_liveInstances = new HashMap<>();
_allLiveInstances = new HashMap<>();
_assignableLiveInstances = new HashMap<>();
_clusterConfig = null;
}

Expand All @@ -80,12 +84,16 @@ class ResourceChangeSnapshot {
ResourceChangeSnapshot(ResourceControllerDataProvider dataProvider,
boolean ignoreNonTopologyChange) {
_changedTypes = new HashSet<>(dataProvider.getRefreshedChangeTypes());

_instanceConfigMap = ignoreNonTopologyChange ?
_allInstanceConfigMap = ignoreNonTopologyChange ?
dataProvider.getInstanceConfigMap().entrySet().parallelStream().collect(Collectors
.toMap(e -> e.getKey(),
e -> InstanceConfigTrimmer.getInstance().trimProperty(e.getValue()))) :
new HashMap<>(dataProvider.getInstanceConfigMap());
_assignableInstanceConfigMap = ignoreNonTopologyChange ?
dataProvider.getAssignableInstanceConfigMap().entrySet().parallelStream().collect(Collectors
.toMap(e -> e.getKey(),
e -> InstanceConfigTrimmer.getInstance().trimProperty(e.getValue()))) :
new HashMap<>(dataProvider.getAssignableInstanceConfigMap());
_idealStateMap = ignoreNonTopologyChange ?
dataProvider.getIdealStates().entrySet().parallelStream().collect(Collectors
.toMap(e -> e.getKey(),
Expand All @@ -99,7 +107,8 @@ class ResourceChangeSnapshot {
_clusterConfig = ignoreNonTopologyChange ?
ClusterConfigTrimmer.getInstance().trimProperty(dataProvider.getClusterConfig()) :
dataProvider.getClusterConfig();
_liveInstances = new HashMap<>(dataProvider.getLiveInstances());
_allLiveInstances = new HashMap<>(dataProvider.getLiveInstances());
_assignableLiveInstances = new HashMap<>(dataProvider.getAssignableLiveInstances());
}

/**
Expand All @@ -108,10 +117,12 @@ class ResourceChangeSnapshot {
*/
ResourceChangeSnapshot(ResourceChangeSnapshot snapshot) {
_changedTypes = new HashSet<>(snapshot._changedTypes);
_instanceConfigMap = new HashMap<>(snapshot._instanceConfigMap);
_allInstanceConfigMap = new HashMap<>(snapshot._allInstanceConfigMap);
_assignableInstanceConfigMap = new HashMap<>(snapshot._assignableInstanceConfigMap);
_idealStateMap = new HashMap<>(snapshot._idealStateMap);
_resourceConfigMap = new HashMap<>(snapshot._resourceConfigMap);
_liveInstances = new HashMap<>(snapshot._liveInstances);
_allLiveInstances = new HashMap<>(snapshot._allLiveInstances);
_assignableLiveInstances = new HashMap<>(snapshot._assignableLiveInstances);
_clusterConfig = snapshot._clusterConfig;
}

Expand All @@ -120,7 +131,11 @@ Set<HelixConstants.ChangeType> getChangedTypes() {
}

Map<String, InstanceConfig> getInstanceConfigMap() {
return _instanceConfigMap;
return _allInstanceConfigMap;
}

Map<String, InstanceConfig> getAssignableInstanceConfigMap() {
return _assignableInstanceConfigMap;
}

Map<String, IdealState> getIdealStateMap() {
Expand All @@ -132,7 +147,11 @@ Map<String, ResourceConfig> getResourceConfigMap() {
}

Map<String, LiveInstance> getLiveInstances() {
return _liveInstances;
return _allLiveInstances;
}

Map<String, LiveInstance> getAssignableLiveInstances() {
return _assignableLiveInstances;
}

ClusterConfig getClusterConfig() {
Expand Down
Loading
Loading