Rest cache - property cache #2658
+370
−13
There are no files selected for viewing
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
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
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,68 @@ | ||
| package org.apache.helix.rest.common.dataprovider; | ||
|
|
||
| /* | ||
| * 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. | ||
| * | ||
| */ | ||
|
|
||
| /** Init, register listener and manager callback handler for different | ||
| * clusters manage the providers lifecycle | ||
| * | ||
| */ | ||
|
Comment on lines
+23
to
+26
There was a problem hiding this comment. Wrong place for comments. |
||
|
|
||
| import java.util.List; | ||
| import org.apache.helix.HelixAdmin; | ||
| import org.apache.helix.manager.zk.ZkBaseDataAccessor; | ||
| import org.apache.helix.zookeeper.api.client.RealmAwareZkClient; | ||
|
|
||
|
|
||
| public class HelixRestDataProviderManager { | ||
|
|
||
| protected RealmAwareZkClient _zkclient; | ||
|
|
||
| private HelixAdmin _helixAdmin; | ||
|
|
||
| private RestServiceDataProvider _restServiceDataProvider; | ||
| // list of callback handlers | ||
|
|
||
| //TODO: create own zk client | ||
| public HelixRestDataProviderManager(RealmAwareZkClient zkclient, HelixAdmin helixAdmin) { | ||
| _zkclient = zkclient; | ||
| _helixAdmin = helixAdmin; | ||
| _restServiceDataProvider = new RestServiceDataProvider(); | ||
| init(); | ||
| } | ||
|
|
||
| public RestServiceDataProvider getRestServiceDataProvider() { | ||
| return _restServiceDataProvider; | ||
| } | ||
|
|
||
| private void init() { | ||
| List<String> clusters = _helixAdmin.getClusters(); | ||
| for (String cluster : clusters) { | ||
| PerClusterDataProvider clusterDataProvider = | ||
| new PerClusterDataProvider(cluster, _zkclient, new ZkBaseDataAccessor(_zkclient)); | ||
| clusterDataProvider.initCache(); | ||
| // register callback handler for each provider | ||
| _restServiceDataProvider.addClusterDataProvider(cluster, clusterDataProvider); | ||
| } | ||
| } | ||
|
|
||
| public void close() { | ||
|
There was a problem hiding this comment. Close should pair with connect / start. Do you want to make it as thread based class? |
||
| } | ||
| } | ||
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,91 @@ | ||
| package org.apache.helix.rest.common.dataprovider; | ||
|
|
||
| /* | ||
| * 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 java.util.Map; | ||
| import org.apache.helix.BaseDataAccessor; | ||
| import org.apache.helix.HelixDataAccessor; | ||
| import org.apache.helix.PropertyKey; | ||
| import org.apache.helix.common.caches.PropertyCache; | ||
| import org.apache.helix.manager.zk.ZKHelixDataAccessor; | ||
| import org.apache.helix.model.ClusterConfig; | ||
| import org.apache.helix.model.ClusterConstraints; | ||
| import org.apache.helix.model.CurrentState; | ||
| import org.apache.helix.model.ExternalView; | ||
| import org.apache.helix.model.IdealState; | ||
| import org.apache.helix.model.InstanceConfig; | ||
| import org.apache.helix.model.LiveInstance; | ||
| import org.apache.helix.model.ResourceConfig; | ||
| import org.apache.helix.model.StateModelDefinition; | ||
| import org.apache.helix.zookeeper.api.client.RealmAwareZkClient; | ||
|
|
||
|
|
||
| /** | ||
| * Dara cache for each Helix cluster. Configs, ideal stats and current states are read from ZK and updated | ||
|
There was a problem hiding this comment. Typo: |
||
| * using event changes. External view are consolidated using current state. | ||
| */ | ||
| public class PerClusterDataProvider { | ||
|
|
||
| private HelixDataAccessor _accessor; | ||
|
|
||
| private RealmAwareZkClient _zkclient; | ||
|
|
||
|
|
||
| private final String _clusterName; | ||
|
|
||
| // Simple caches | ||
| private final RestPropertyCache<InstanceConfig> _instanceConfigCache; | ||
| private final RestPropertyCache<ClusterConfig> _clusterConfigCache; | ||
| private final RestPropertyCache<ResourceConfig> _resourceConfigCache; | ||
|
There was a problem hiding this comment. Do we need ResourceConfig cache? |
||
| private final RestPropertyCache<LiveInstance> _liveInstanceCache; | ||
| private final RestPropertyCache<IdealState> _idealStateCache; | ||
| private final RestPropertyCache<StateModelDefinition> _stateModelDefinitionCache; | ||
|
|
||
|
|
||
| // special caches | ||
| private final RestCurrentStateCache _currentStateCache; | ||
|
|
||
| // TODO: add external view caches | ||
|
|
||
| public PerClusterDataProvider(String clusterName, RealmAwareZkClient zkClient, BaseDataAccessor baseDataAccessor) { | ||
| _clusterName = clusterName; | ||
| _accessor = new ZKHelixDataAccessor(clusterName, baseDataAccessor); | ||
|
|
||
| _zkclient = zkClient; | ||
| _instanceConfigCache = null; | ||
| _clusterConfigCache = null; | ||
| _resourceConfigCache = null; | ||
| _liveInstanceCache = null; | ||
| _idealStateCache = null; | ||
| _stateModelDefinitionCache = null; | ||
| _currentStateCache = null; | ||
| } | ||
| // TODO: consolidate EV from CSs | ||
| public Map<String, ExternalView> consolidateExternalViews() { | ||
|
There was a problem hiding this comment. Just to understand, if the stoppable check wants to get the external view from the cache, it should call There was a problem hiding this comment. It should just call getEV. consolidateExternalViews will be called internal in this data provider |
||
| return null; | ||
| } | ||
|
|
||
| // Used for dummy cache. Remove later | ||
| public void initCache(final HelixDataAccessor accessor) { | ||
|
|
||
| } | ||
|
|
||
| public void initCache() { | ||
|
|
||
| } | ||
| } | ||
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,42 @@ | ||
| package org.apache.helix.rest.common.dataprovider; | ||
|
|
||
| /* | ||
| * 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 java.util.concurrent.ConcurrentHashMap; | ||
| import org.apache.helix.HelixDataAccessor; | ||
| import org.apache.helix.model.CurrentState; | ||
|
|
||
|
|
||
| /** | ||
| * Special cache for instances current states. | ||
|
There was a problem hiding this comment. Why not CurrentStateCache instead of building its own? |
||
| * | ||
| */ | ||
| public class RestCurrentStateCache { | ||
|
|
||
| //Map<instanceName, Map<ResourceName, CurrentState>> | ||
| private ConcurrentHashMap<String, ConcurrentHashMap<String, CurrentState>> _objCache; | ||
|
|
||
| public RestCurrentStateCache() { | ||
| _objCache = new ConcurrentHashMap<>(); | ||
| } | ||
|
|
||
| public void init(final HelixDataAccessor accessor) { | ||
| } | ||
| } | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We probably need checks before
instanceConfigMap.get()