forked from apache/helix
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "Refine the WAGED rebalancer related interfaces for integration (
apache#431)" (apache#437) This reverts commit 08a2015.
- Loading branch information
1 parent
502800d
commit e1c622b
Showing
9 changed files
with
260 additions
and
202 deletions.
There are no files selected for viewing
43 changes: 0 additions & 43 deletions
43
helix-core/src/main/java/org/apache/helix/HelixRebalanceException.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
67 changes: 67 additions & 0 deletions
67
helix-core/src/main/java/org/apache/helix/controller/rebalancer/GlobalRebalancer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| package org.apache.helix.controller.rebalancer; | ||
|
|
||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| import org.apache.helix.HelixManager; | ||
| import org.apache.helix.controller.dataproviders.BaseControllerDataProvider; | ||
| import org.apache.helix.controller.stages.CurrentStateOutput; | ||
| import org.apache.helix.model.IdealState; | ||
| import org.apache.helix.model.Resource; | ||
|
|
||
| import java.util.Map; | ||
|
|
||
| public interface GlobalRebalancer<T extends BaseControllerDataProvider> { | ||
| enum RebalanceFailureType { | ||
| INVALID_CLUSTER_STATUS, | ||
| INVALID_REBALANCER_STATUS, | ||
| FAILED_TO_CALCULATE, | ||
| UNKNOWN_FAILURE | ||
| } | ||
|
|
||
| class RebalanceFailureReason { | ||
| private final static String DEFAULT_REASON_MESSAGE = "No detail"; | ||
| private final RebalanceFailureType _type; | ||
| private final String _reason; | ||
|
|
||
| public RebalanceFailureReason(RebalanceFailureType type) { | ||
| this(type, DEFAULT_REASON_MESSAGE); | ||
| } | ||
|
|
||
| public RebalanceFailureReason(RebalanceFailureType type, String reason) { | ||
| _type = type; | ||
| _reason = reason; | ||
| } | ||
|
|
||
| public RebalanceFailureType get_type() { | ||
| return _type; | ||
| } | ||
|
|
||
| public String get_reason() { | ||
| return _reason; | ||
| } | ||
| } | ||
|
|
||
| void init(HelixManager manager); | ||
|
|
||
| Map<String, IdealState> computeNewIdealState(final CurrentStateOutput currentStateOutput, | ||
| T clusterData, Map<String, Resource> resourceMap); | ||
|
|
||
| RebalanceFailureReason getFailureReason(); | ||
| } |
73 changes: 73 additions & 0 deletions
73
...-core/src/main/java/org/apache/helix/controller/rebalancer/waged/ClusterDataDetector.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| package org.apache.helix.controller.rebalancer.waged; | ||
|
|
||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| import org.apache.helix.controller.dataproviders.BaseControllerDataProvider; | ||
|
|
||
| import java.util.Collections; | ||
| import java.util.Map; | ||
| import java.util.Set; | ||
|
|
||
| /** | ||
| * A placeholder before we have the Cluster Data Detector implemented. | ||
| * | ||
| * @param <T> The cache class that can be handled by the detector. | ||
| */ | ||
| public class ClusterDataDetector<T extends BaseControllerDataProvider> { | ||
| /** | ||
| * All the cluster change type that may trigger a WAGED rebalancer re-calculation. | ||
| */ | ||
| public enum ChangeType { | ||
| BaselineAssignmentChange, | ||
| InstanceConfigChange, | ||
| ClusterConfigChange, | ||
| ResourceConfigChange, | ||
| ResourceIdealStatesChange, | ||
| InstanceStateChange, | ||
| OtherChange | ||
| } | ||
|
|
||
| private Map<ChangeType, Set<String>> _currentChanges = | ||
| Collections.singletonMap(ChangeType.ClusterConfigChange, Collections.emptySet()); | ||
|
|
||
| public void updateClusterStatus(T cache) { | ||
| } | ||
|
|
||
| /** | ||
| * Returns all change types detected during the ClusterDetection stage. | ||
| */ | ||
| public Set<ChangeType> getChangeTypes() { | ||
| return _currentChanges.keySet(); | ||
| } | ||
|
|
||
| /** | ||
| * Returns a set of the names of components that changed based on the given change type. | ||
| */ | ||
| public Set<String> getChangesBasedOnType(ChangeType changeType) { | ||
| return _currentChanges.get(changeType); | ||
| } | ||
|
|
||
| /** | ||
| * Return a map of the change details <type, change details>. | ||
| */ | ||
| public Map<ChangeType, Set<String>> getAllChanges() { | ||
| return _currentChanges; | ||
| } | ||
| } |
54 changes: 54 additions & 0 deletions
54
...-core/src/main/java/org/apache/helix/controller/rebalancer/waged/ClusterDataProvider.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| package org.apache.helix.controller.rebalancer.waged; | ||
|
|
||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| import org.apache.helix.controller.dataproviders.ResourceControllerDataProvider; | ||
| import org.apache.helix.controller.rebalancer.waged.model.ClusterModel; | ||
| import org.apache.helix.model.ResourceAssignment; | ||
|
|
||
| import java.util.Map; | ||
| import java.util.Set; | ||
|
|
||
| /** | ||
| * A placeholder before we have the implementation. | ||
| * | ||
| * The data provider generates the Cluster Model based on the controller's data cache. | ||
| */ | ||
| public class ClusterDataProvider { | ||
|
|
||
| /** | ||
| * @param dataProvider The controller's data cache. | ||
| * @param activeInstances The logical active instances that will be used in the calculation. Note | ||
| * This list can be different from the real active node list according to | ||
| * the rebalancer logic. | ||
| * @param clusterChanges All the cluster changes that happened after the previous rebalance. | ||
| * @param baselineAssignment The persisted Baseline assignment. | ||
| * @param bestPossibleAssignment The persisted Best Possible assignment that was generated in the | ||
| * previous rebalance. | ||
| * @return The cluster model as the input for the upcoming rebalance. | ||
| */ | ||
| protected static ClusterModel generateClusterModel(ResourceControllerDataProvider dataProvider, | ||
| Set<String> activeInstances, Map<ClusterDataDetector.ChangeType, Set<String>> clusterChanges, | ||
| Map<String, ResourceAssignment> baselineAssignment, | ||
| Map<String, ResourceAssignment> bestPossibleAssignment) { | ||
| // TODO finish the implementation. | ||
| return null; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.