upthewaterspout commented on a change in pull request #6467: URL: https://github.com/apache/geode/pull/6467#discussion_r631217891
########## File path: geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/SlotAdvisor.java ########## @@ -0,0 +1,230 @@ +/* + * 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. + */ + +package org.apache.geode.redis.internal; + +import static org.apache.geode.redis.internal.RegionProvider.REDIS_REGION_BUCKETS; +import static org.apache.geode.redis.internal.RegionProvider.REDIS_SLOTS_PER_BUCKET; +import static org.apache.geode.redis.internal.cluster.RedisMemberInfoRetrievalFunction.RedisMemberInfo; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.apache.commons.lang3.tuple.Pair; +import org.apache.logging.log4j.Logger; + +import org.apache.geode.cache.Region; +import org.apache.geode.cache.execute.FunctionService; +import org.apache.geode.cache.execute.ResultCollector; +import org.apache.geode.cache.partition.PartitionMemberInfo; +import org.apache.geode.cache.partition.PartitionRegionHelper; +import org.apache.geode.cache.partition.PartitionRegionInfo; +import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.internal.cache.PartitionedRegion; +import org.apache.geode.logging.internal.log4j.api.LogService; +import org.apache.geode.redis.internal.cluster.RedisMemberInfoRetrievalFunction; +import org.apache.geode.redis.internal.data.RedisData; +import org.apache.geode.redis.internal.data.RedisKey; + +public class SlotAdvisor { + + private static final Logger logger = LogService.getLogger(); + + /** + * Mapping buckets to slot information + */ + private final List<MemberBucketSlot> memberBucketSlots; + + /** + * Cache of member ids to member IP address and redis listening port + */ + private final Map<String, Pair<String, Integer>> hostPorts = new HashMap<>(); + private final PartitionedRegion dataRegion; + private final Region<String, Object> configRegion; + + SlotAdvisor(Region<RedisKey, RedisData> dataRegion, Region<String, Object> configRegion) { + this.dataRegion = (PartitionedRegion) dataRegion; + this.configRegion = configRegion; + memberBucketSlots = new ArrayList<>(RegionProvider.REDIS_REGION_BUCKETS); + for (int i = 0; i < REDIS_REGION_BUCKETS; i++) { + memberBucketSlots.add(null); + } + } + + public boolean isLocal(RedisKey key) { + return dataRegion.getRegionAdvisor().getBucket(key.getBucketId()).getBucketAdvisor() + .isPrimary(); + } + + public Pair<String, Integer> getHostAndPortForKey(RedisKey key) { + int bucketId = key.getBucketId(); + MemberBucketSlot mbs = updateBucketDetails(bucketId); + + return Pair.of(mbs.getPrimaryIpAddress(), mbs.getPrimaryPort()); + } + + public Map<String, List<Integer>> getMemberBuckets() { + initializeBucketsIfNecessary(); + + Map<String, List<Integer>> memberBuckets = new HashMap<>(); + for (int bucketId = 0; bucketId < REDIS_REGION_BUCKETS; bucketId++) { + String memberId = + dataRegion.getRegionAdvisor().getBucketAdvisor(bucketId).getPrimary().getUniqueId(); + memberBuckets.computeIfAbsent(memberId, k -> new ArrayList<>()).add(bucketId); + } + + return memberBuckets; + } + + public synchronized List<MemberBucketSlot> getBucketSlots() { + initializeBucketsIfNecessary(); + + for (int bucketId = 0; bucketId < REDIS_REGION_BUCKETS; bucketId++) { + updateBucketDetails(bucketId); + } + + return Collections.unmodifiableList(memberBucketSlots); + } + + private synchronized MemberBucketSlot updateBucketDetails(int bucketId) { + MemberBucketSlot mbs = null; + try { + Pair<String, Integer> hostPort = getHostPort(bucketId); + + mbs = memberBucketSlots.get(bucketId); + if (mbs == null) { + mbs = new MemberBucketSlot(bucketId, hostPort.getLeft(), hostPort.getRight()); + memberBucketSlots.set(bucketId, mbs); + } else { + mbs.setPrimaryIpAddress(hostPort.getLeft()); + mbs.setPrimaryPort(hostPort.getRight()); + } + } catch (Exception ex) { + logger.error("Unable to update bucket detail for bucketId: {}", bucketId, ex); + } + + return mbs; + } + + private void initializeBucketsIfNecessary() { + if (dataRegion.getDataStore() != null && + dataRegion.getDataStore().getAllLocalBucketIds().isEmpty()) { + PartitionRegionHelper.assignBucketsToPartitions(dataRegion); + } + } + + @SuppressWarnings("unchecked") + private Pair<String, Integer> getHostPort(int bucketId) { + String memberId = + dataRegion.getRegionAdvisor().getBucketAdvisor(bucketId).getPrimary().getUniqueId(); + + if (hostPorts.containsKey(memberId)) { + return hostPorts.get(memberId); + } + + Set<DistributedMember> membersWithDataRegion = new HashSet<>(); + for (PartitionMemberInfo memberInfo : getRegionMembers(dataRegion)) { + membersWithDataRegion.add(memberInfo.getDistributedMember()); + } + + ResultCollector<RedisMemberInfo, List<RedisMemberInfo>> resultCollector = + FunctionService.onMembers(membersWithDataRegion) Review comment: This should just use onRegion instead of onMembers, and then you don't need to lookup which members have the region. ########## File path: geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/SlotAdvisor.java ########## @@ -0,0 +1,230 @@ +/* + * 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. + */ + +package org.apache.geode.redis.internal; + +import static org.apache.geode.redis.internal.RegionProvider.REDIS_REGION_BUCKETS; +import static org.apache.geode.redis.internal.RegionProvider.REDIS_SLOTS_PER_BUCKET; +import static org.apache.geode.redis.internal.cluster.RedisMemberInfoRetrievalFunction.RedisMemberInfo; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.apache.commons.lang3.tuple.Pair; +import org.apache.logging.log4j.Logger; + +import org.apache.geode.cache.Region; +import org.apache.geode.cache.execute.FunctionService; +import org.apache.geode.cache.execute.ResultCollector; +import org.apache.geode.cache.partition.PartitionMemberInfo; +import org.apache.geode.cache.partition.PartitionRegionHelper; +import org.apache.geode.cache.partition.PartitionRegionInfo; +import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.internal.cache.PartitionedRegion; +import org.apache.geode.logging.internal.log4j.api.LogService; +import org.apache.geode.redis.internal.cluster.RedisMemberInfoRetrievalFunction; +import org.apache.geode.redis.internal.data.RedisData; +import org.apache.geode.redis.internal.data.RedisKey; + +public class SlotAdvisor { + + private static final Logger logger = LogService.getLogger(); + + /** + * Mapping buckets to slot information + */ + private final List<MemberBucketSlot> memberBucketSlots; + + /** + * Cache of member ids to member IP address and redis listening port + */ + private final Map<String, Pair<String, Integer>> hostPorts = new HashMap<>(); + private final PartitionedRegion dataRegion; + private final Region<String, Object> configRegion; + + SlotAdvisor(Region<RedisKey, RedisData> dataRegion, Region<String, Object> configRegion) { + this.dataRegion = (PartitionedRegion) dataRegion; + this.configRegion = configRegion; + memberBucketSlots = new ArrayList<>(RegionProvider.REDIS_REGION_BUCKETS); + for (int i = 0; i < REDIS_REGION_BUCKETS; i++) { + memberBucketSlots.add(null); + } + } + + public boolean isLocal(RedisKey key) { + return dataRegion.getRegionAdvisor().getBucket(key.getBucketId()).getBucketAdvisor() + .isPrimary(); + } + + public Pair<String, Integer> getHostAndPortForKey(RedisKey key) { + int bucketId = key.getBucketId(); + MemberBucketSlot mbs = updateBucketDetails(bucketId); + + return Pair.of(mbs.getPrimaryIpAddress(), mbs.getPrimaryPort()); + } + + public Map<String, List<Integer>> getMemberBuckets() { + initializeBucketsIfNecessary(); + + Map<String, List<Integer>> memberBuckets = new HashMap<>(); + for (int bucketId = 0; bucketId < REDIS_REGION_BUCKETS; bucketId++) { + String memberId = + dataRegion.getRegionAdvisor().getBucketAdvisor(bucketId).getPrimary().getUniqueId(); + memberBuckets.computeIfAbsent(memberId, k -> new ArrayList<>()).add(bucketId); + } + + return memberBuckets; + } + + public synchronized List<MemberBucketSlot> getBucketSlots() { + initializeBucketsIfNecessary(); + + for (int bucketId = 0; bucketId < REDIS_REGION_BUCKETS; bucketId++) { + updateBucketDetails(bucketId); + } + + return Collections.unmodifiableList(memberBucketSlots); + } + + private synchronized MemberBucketSlot updateBucketDetails(int bucketId) { + MemberBucketSlot mbs = null; + try { + Pair<String, Integer> hostPort = getHostPort(bucketId); + + mbs = memberBucketSlots.get(bucketId); + if (mbs == null) { + mbs = new MemberBucketSlot(bucketId, hostPort.getLeft(), hostPort.getRight()); + memberBucketSlots.set(bucketId, mbs); + } else { + mbs.setPrimaryIpAddress(hostPort.getLeft()); + mbs.setPrimaryPort(hostPort.getRight()); + } + } catch (Exception ex) { + logger.error("Unable to update bucket detail for bucketId: {}", bucketId, ex); + } + + return mbs; + } + + private void initializeBucketsIfNecessary() { + if (dataRegion.getDataStore() != null && + dataRegion.getDataStore().getAllLocalBucketIds().isEmpty()) { + PartitionRegionHelper.assignBucketsToPartitions(dataRegion); + } + } + + @SuppressWarnings("unchecked") + private Pair<String, Integer> getHostPort(int bucketId) { + String memberId = + dataRegion.getRegionAdvisor().getBucketAdvisor(bucketId).getPrimary().getUniqueId(); + + if (hostPorts.containsKey(memberId)) { + return hostPorts.get(memberId); + } + + Set<DistributedMember> membersWithDataRegion = new HashSet<>(); + for (PartitionMemberInfo memberInfo : getRegionMembers(dataRegion)) { + membersWithDataRegion.add(memberInfo.getDistributedMember()); + } + + ResultCollector<RedisMemberInfo, List<RedisMemberInfo>> resultCollector = + FunctionService.onMembers(membersWithDataRegion) + .execute(RedisMemberInfoRetrievalFunction.ID); + + hostPorts.clear(); + + for (RedisMemberInfo memberInfo : resultCollector.getResult()) { + Pair<String, Integer> hostPort = + Pair.of(memberInfo.getHostAddress(), memberInfo.getRedisPort()); + hostPorts.put(memberInfo.getMemberId(), hostPort); + } + + if (!hostPorts.containsKey(memberId)) { + // There is a very tiny window where this might happen - a member was hosting a bucket and + // died before the fn call above could even complete. + throw new RuntimeException("Unable to retrieve host and redis port for member: " + memberId); Review comment: This doesn't seem like a good user experience to get exceptions in this situation - should this trigger a retry? ########## File path: geode-apis-compatible-with-redis/src/main/resources/org/apache/geode/redis/internal/sanctioned-geode-apis-compatible-with-redis-serializables.txt ########## @@ -1,8 +1,8 @@ org/apache/geode/redis/internal/ParameterRequirements/RedisParametersMismatchException,true,-643700717871858072 org/apache/geode/redis/internal/RedisCommandSupportLevel,false org/apache/geode/redis/internal/RedisCommandType,false,deferredParameterRequirements:org/apache/geode/redis/internal/ParameterRequirements/ParameterRequirements,executor:org/apache/geode/redis/internal/executor/Executor,parameterRequirements:org/apache/geode/redis/internal/ParameterRequirements/ParameterRequirements,supportLevel:org/apache/geode/redis/internal/RedisCommandSupportLevel -org/apache/geode/redis/internal/cluster/BucketInfoRetrievalFunction,false,hostAddress:java/lang/String,redisPort:int -org/apache/geode/redis/internal/cluster/BucketInfoRetrievalFunction$MemberBuckets,false,hostAddress:java/lang/String,memberId:java/lang/String,port:int,primaryBucketIds:java/util/Set +org/apache/geode/redis/internal/cluster/RedisMemberInfoRetrievalFunction,true,2207969011229079993,hostAddress:java/lang/String,redisPort:int Review comment: I think this function should really be in the excludedClasses instead. It's not sent over the wire. ########## File path: geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/cluster/RedisMemberInfoRetrievalFunction.java ########## @@ -53,49 +47,31 @@ private BucketInfoRetrievalFunction(String address, int redisPort) { } public static void register(String address, int redisPort) { - FunctionService.registerFunction(new BucketInfoRetrievalFunction(address, redisPort)); + FunctionService.registerFunction(new RedisMemberInfoRetrievalFunction(address, redisPort)); } @Override public void execute(FunctionContext<Void> context) { - Region<RedisKey, ByteArrayWrapper> region = - context.getCache().getRegion(RegionProvider.REDIS_DATA_REGION); - String memberId = context.getCache().getDistributedSystem().getDistributedMember().getUniqueId(); - MemberBuckets mb = new MemberBuckets(memberId, hostAddress, redisPort, - getLocalPrimaryBucketIds(region)); - context.getResultSender().lastResult(mb); + context.getResultSender().lastResult(new RedisMemberInfo(memberId, hostAddress, redisPort)); } @Override public String getId() { return ID; } - @SuppressWarnings("unchecked") - public static Set<Integer> getLocalPrimaryBucketIds(Region region) { - PartitionedRegion pr = (PartitionedRegion) region; - if (pr.getDataStore() != null) { - return new HashSet<>(pr.getDataStore().getAllLocalPrimaryBucketIds()); - } else { - return Collections.EMPTY_SET; - } - } - - public static class MemberBuckets implements Serializable { + public static class RedisMemberInfo implements Serializable { Review comment: This should probably be BasicSerializable or even DataSerializableFixedID, rather than a java serializable. ########## File path: geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/SlotAdvisor.java ########## @@ -0,0 +1,230 @@ +/* + * 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. + */ + +package org.apache.geode.redis.internal; + +import static org.apache.geode.redis.internal.RegionProvider.REDIS_REGION_BUCKETS; +import static org.apache.geode.redis.internal.RegionProvider.REDIS_SLOTS_PER_BUCKET; +import static org.apache.geode.redis.internal.cluster.RedisMemberInfoRetrievalFunction.RedisMemberInfo; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.apache.commons.lang3.tuple.Pair; +import org.apache.logging.log4j.Logger; + +import org.apache.geode.cache.Region; +import org.apache.geode.cache.execute.FunctionService; +import org.apache.geode.cache.execute.ResultCollector; +import org.apache.geode.cache.partition.PartitionMemberInfo; +import org.apache.geode.cache.partition.PartitionRegionHelper; +import org.apache.geode.cache.partition.PartitionRegionInfo; +import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.internal.cache.PartitionedRegion; +import org.apache.geode.logging.internal.log4j.api.LogService; +import org.apache.geode.redis.internal.cluster.RedisMemberInfoRetrievalFunction; +import org.apache.geode.redis.internal.data.RedisData; +import org.apache.geode.redis.internal.data.RedisKey; + +public class SlotAdvisor { + + private static final Logger logger = LogService.getLogger(); + + /** + * Mapping buckets to slot information + */ + private final List<MemberBucketSlot> memberBucketSlots; + + /** + * Cache of member ids to member IP address and redis listening port + */ + private final Map<String, Pair<String, Integer>> hostPorts = new HashMap<>(); + private final PartitionedRegion dataRegion; + private final Region<String, Object> configRegion; + + SlotAdvisor(Region<RedisKey, RedisData> dataRegion, Region<String, Object> configRegion) { + this.dataRegion = (PartitionedRegion) dataRegion; + this.configRegion = configRegion; + memberBucketSlots = new ArrayList<>(RegionProvider.REDIS_REGION_BUCKETS); + for (int i = 0; i < REDIS_REGION_BUCKETS; i++) { + memberBucketSlots.add(null); + } + } + + public boolean isLocal(RedisKey key) { + return dataRegion.getRegionAdvisor().getBucket(key.getBucketId()).getBucketAdvisor() + .isPrimary(); + } + + public Pair<String, Integer> getHostAndPortForKey(RedisKey key) { + int bucketId = key.getBucketId(); + MemberBucketSlot mbs = updateBucketDetails(bucketId); + + return Pair.of(mbs.getPrimaryIpAddress(), mbs.getPrimaryPort()); + } + + public Map<String, List<Integer>> getMemberBuckets() { + initializeBucketsIfNecessary(); + + Map<String, List<Integer>> memberBuckets = new HashMap<>(); + for (int bucketId = 0; bucketId < REDIS_REGION_BUCKETS; bucketId++) { + String memberId = + dataRegion.getRegionAdvisor().getBucketAdvisor(bucketId).getPrimary().getUniqueId(); Review comment: Maybe it would be better to keep member ids as `InternalDistributedMember` in most places until we actually return a string to the user? I normally don't like converting objects to strings and doing comparisons on the strings. ########## File path: geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/SlotAdvisor.java ########## @@ -0,0 +1,230 @@ +/* + * 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. + */ + +package org.apache.geode.redis.internal; + +import static org.apache.geode.redis.internal.RegionProvider.REDIS_REGION_BUCKETS; +import static org.apache.geode.redis.internal.RegionProvider.REDIS_SLOTS_PER_BUCKET; +import static org.apache.geode.redis.internal.cluster.RedisMemberInfoRetrievalFunction.RedisMemberInfo; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.apache.commons.lang3.tuple.Pair; +import org.apache.logging.log4j.Logger; + +import org.apache.geode.cache.Region; +import org.apache.geode.cache.execute.FunctionService; +import org.apache.geode.cache.execute.ResultCollector; +import org.apache.geode.cache.partition.PartitionMemberInfo; +import org.apache.geode.cache.partition.PartitionRegionHelper; +import org.apache.geode.cache.partition.PartitionRegionInfo; +import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.internal.cache.PartitionedRegion; +import org.apache.geode.logging.internal.log4j.api.LogService; +import org.apache.geode.redis.internal.cluster.RedisMemberInfoRetrievalFunction; +import org.apache.geode.redis.internal.data.RedisData; +import org.apache.geode.redis.internal.data.RedisKey; + +public class SlotAdvisor { + + private static final Logger logger = LogService.getLogger(); + + /** + * Mapping buckets to slot information + */ + private final List<MemberBucketSlot> memberBucketSlots; + + /** + * Cache of member ids to member IP address and redis listening port + */ + private final Map<String, Pair<String, Integer>> hostPorts = new HashMap<>(); + private final PartitionedRegion dataRegion; + private final Region<String, Object> configRegion; + + SlotAdvisor(Region<RedisKey, RedisData> dataRegion, Region<String, Object> configRegion) { + this.dataRegion = (PartitionedRegion) dataRegion; + this.configRegion = configRegion; + memberBucketSlots = new ArrayList<>(RegionProvider.REDIS_REGION_BUCKETS); + for (int i = 0; i < REDIS_REGION_BUCKETS; i++) { + memberBucketSlots.add(null); + } + } + + public boolean isLocal(RedisKey key) { + return dataRegion.getRegionAdvisor().getBucket(key.getBucketId()).getBucketAdvisor() + .isPrimary(); + } + + public Pair<String, Integer> getHostAndPortForKey(RedisKey key) { + int bucketId = key.getBucketId(); + MemberBucketSlot mbs = updateBucketDetails(bucketId); + + return Pair.of(mbs.getPrimaryIpAddress(), mbs.getPrimaryPort()); + } + + public Map<String, List<Integer>> getMemberBuckets() { + initializeBucketsIfNecessary(); + + Map<String, List<Integer>> memberBuckets = new HashMap<>(); + for (int bucketId = 0; bucketId < REDIS_REGION_BUCKETS; bucketId++) { + String memberId = + dataRegion.getRegionAdvisor().getBucketAdvisor(bucketId).getPrimary().getUniqueId(); + memberBuckets.computeIfAbsent(memberId, k -> new ArrayList<>()).add(bucketId); + } + + return memberBuckets; + } + + public synchronized List<MemberBucketSlot> getBucketSlots() { + initializeBucketsIfNecessary(); + + for (int bucketId = 0; bucketId < REDIS_REGION_BUCKETS; bucketId++) { + updateBucketDetails(bucketId); + } + + return Collections.unmodifiableList(memberBucketSlots); + } + + private synchronized MemberBucketSlot updateBucketDetails(int bucketId) { + MemberBucketSlot mbs = null; + try { + Pair<String, Integer> hostPort = getHostPort(bucketId); + + mbs = memberBucketSlots.get(bucketId); + if (mbs == null) { + mbs = new MemberBucketSlot(bucketId, hostPort.getLeft(), hostPort.getRight()); + memberBucketSlots.set(bucketId, mbs); + } else { + mbs.setPrimaryIpAddress(hostPort.getLeft()); + mbs.setPrimaryPort(hostPort.getRight()); + } + } catch (Exception ex) { + logger.error("Unable to update bucket detail for bucketId: {}", bucketId, ex); + } + + return mbs; + } + + private void initializeBucketsIfNecessary() { + if (dataRegion.getDataStore() != null && + dataRegion.getDataStore().getAllLocalBucketIds().isEmpty()) { + PartitionRegionHelper.assignBucketsToPartitions(dataRegion); + } + } + + @SuppressWarnings("unchecked") + private Pair<String, Integer> getHostPort(int bucketId) { + String memberId = + dataRegion.getRegionAdvisor().getBucketAdvisor(bucketId).getPrimary().getUniqueId(); + + if (hostPorts.containsKey(memberId)) { + return hostPorts.get(memberId); + } + + Set<DistributedMember> membersWithDataRegion = new HashSet<>(); + for (PartitionMemberInfo memberInfo : getRegionMembers(dataRegion)) { + membersWithDataRegion.add(memberInfo.getDistributedMember()); + } + + ResultCollector<RedisMemberInfo, List<RedisMemberInfo>> resultCollector = + FunctionService.onMembers(membersWithDataRegion) + .execute(RedisMemberInfoRetrievalFunction.ID); + + hostPorts.clear(); + + for (RedisMemberInfo memberInfo : resultCollector.getResult()) { + Pair<String, Integer> hostPort = + Pair.of(memberInfo.getHostAddress(), memberInfo.getRedisPort()); + hostPorts.put(memberInfo.getMemberId(), hostPort); + } + + if (!hostPorts.containsKey(memberId)) { + // There is a very tiny window where this might happen - a member was hosting a bucket and + // died before the fn call above could even complete. + throw new RuntimeException("Unable to retrieve host and redis port for member: " + memberId); + } + + return hostPorts.get(memberId); + } + + private Set<PartitionMemberInfo> getRegionMembers(PartitionedRegion dataRegion) { + PartitionRegionInfo info = PartitionRegionHelper.getPartitionRegionInfo(dataRegion); + assert info != null; // Mostly to appease IJ since the region is always a PR + + return info.getPartitionMemberInfo(); + } + + public static class MemberBucketSlot { Review comment: The `Integer` objects below could be `int` I think. ########## File path: geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/cluster/ClusterExecutor.java ########## @@ -145,28 +91,34 @@ private RedisResponse getSlots(ExecutionHandlerContext ctx) { * </pre> * * Note that there are no 'slave' entries since Geode does not host all secondary data apart from - * primary as redis does. The cluster port is provided only for consistency with the format - * of the output. + * primary as redis does. The cluster port is provided only for consistency with the format of the + * output. */ private RedisResponse getNodes(ExecutionHandlerContext ctx) { - List<MemberBuckets> memberBuckets = getMemberBuckets(ctx); String memberId = ctx.getMemberName(); + Map<String, List<Integer>> memberBuckets = + ctx.getRegionProvider().getSlotAdvisor().getMemberBuckets(); + List<SlotAdvisor.MemberBucketSlot> memberBucketSlots = + ctx.getRegionProvider().getSlotAdvisor().getBucketSlots(); StringBuilder response = new StringBuilder(); - for (MemberBuckets m : memberBuckets) { - response.append(String.format("%s %s:%d@%d master", - m.getMemberId(), m.getHostAddress(), m.getPort(), m.getPort())); + for (Map.Entry<String, List<Integer>> member : memberBuckets.entrySet()) { + List<Integer> buckets = member.getValue(); + SlotAdvisor.MemberBucketSlot mbs = memberBucketSlots.get(buckets.get(0)); Review comment: Something seems tangled here if we have to assume that buckets have at least 1 entry and we are always calling get(0). ########## File path: geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/SlotAdvisor.java ########## @@ -0,0 +1,230 @@ +/* + * 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. + */ + +package org.apache.geode.redis.internal; + +import static org.apache.geode.redis.internal.RegionProvider.REDIS_REGION_BUCKETS; +import static org.apache.geode.redis.internal.RegionProvider.REDIS_SLOTS_PER_BUCKET; +import static org.apache.geode.redis.internal.cluster.RedisMemberInfoRetrievalFunction.RedisMemberInfo; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.apache.commons.lang3.tuple.Pair; +import org.apache.logging.log4j.Logger; + +import org.apache.geode.cache.Region; +import org.apache.geode.cache.execute.FunctionService; +import org.apache.geode.cache.execute.ResultCollector; +import org.apache.geode.cache.partition.PartitionMemberInfo; +import org.apache.geode.cache.partition.PartitionRegionHelper; +import org.apache.geode.cache.partition.PartitionRegionInfo; +import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.internal.cache.PartitionedRegion; +import org.apache.geode.logging.internal.log4j.api.LogService; +import org.apache.geode.redis.internal.cluster.RedisMemberInfoRetrievalFunction; +import org.apache.geode.redis.internal.data.RedisData; +import org.apache.geode.redis.internal.data.RedisKey; + +public class SlotAdvisor { + + private static final Logger logger = LogService.getLogger(); + + /** + * Mapping buckets to slot information + */ + private final List<MemberBucketSlot> memberBucketSlots; Review comment: It seems like we don't really need to keep this as a field. For every call it looks like we're updating this list this the new primary locations (or at least we should be!). It would be clearer and cleaner not to have this as a field at all. ########## File path: geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/executor/cluster/ClusterExecutor.java ########## @@ -145,28 +91,34 @@ private RedisResponse getSlots(ExecutionHandlerContext ctx) { * </pre> * * Note that there are no 'slave' entries since Geode does not host all secondary data apart from - * primary as redis does. The cluster port is provided only for consistency with the format - * of the output. + * primary as redis does. The cluster port is provided only for consistency with the format of the + * output. */ private RedisResponse getNodes(ExecutionHandlerContext ctx) { - List<MemberBuckets> memberBuckets = getMemberBuckets(ctx); String memberId = ctx.getMemberName(); + Map<String, List<Integer>> memberBuckets = + ctx.getRegionProvider().getSlotAdvisor().getMemberBuckets(); + List<SlotAdvisor.MemberBucketSlot> memberBucketSlots = + ctx.getRegionProvider().getSlotAdvisor().getBucketSlots(); StringBuilder response = new StringBuilder(); - for (MemberBuckets m : memberBuckets) { - response.append(String.format("%s %s:%d@%d master", - m.getMemberId(), m.getHostAddress(), m.getPort(), m.getPort())); + for (Map.Entry<String, List<Integer>> member : memberBuckets.entrySet()) { + List<Integer> buckets = member.getValue(); + SlotAdvisor.MemberBucketSlot mbs = memberBucketSlots.get(buckets.get(0)); - if (m.getMemberId().equals(memberId)) { + response.append(String.format("%s %s:%3$d@%3$d master", + member.getKey(), mbs.getPrimaryIpAddress(), mbs.getPrimaryPort())); + + if (member.getKey().equals(memberId)) { response.append(",myself"); } response.append(" - 0 0 1 connected"); - for (Integer index : m.getPrimaryBucketIds()) { + for (Integer bucket : member.getValue()) { Review comment: `int` instead of `Integer` ########## File path: geode-apis-compatible-with-redis/src/main/java/org/apache/geode/redis/internal/SlotAdvisor.java ########## @@ -0,0 +1,230 @@ +/* + * 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. + */ + +package org.apache.geode.redis.internal; + +import static org.apache.geode.redis.internal.RegionProvider.REDIS_REGION_BUCKETS; +import static org.apache.geode.redis.internal.RegionProvider.REDIS_SLOTS_PER_BUCKET; +import static org.apache.geode.redis.internal.cluster.RedisMemberInfoRetrievalFunction.RedisMemberInfo; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.apache.commons.lang3.tuple.Pair; +import org.apache.logging.log4j.Logger; + +import org.apache.geode.cache.Region; +import org.apache.geode.cache.execute.FunctionService; +import org.apache.geode.cache.execute.ResultCollector; +import org.apache.geode.cache.partition.PartitionMemberInfo; +import org.apache.geode.cache.partition.PartitionRegionHelper; +import org.apache.geode.cache.partition.PartitionRegionInfo; +import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.internal.cache.PartitionedRegion; +import org.apache.geode.logging.internal.log4j.api.LogService; +import org.apache.geode.redis.internal.cluster.RedisMemberInfoRetrievalFunction; +import org.apache.geode.redis.internal.data.RedisData; +import org.apache.geode.redis.internal.data.RedisKey; + +public class SlotAdvisor { + + private static final Logger logger = LogService.getLogger(); + + /** + * Mapping buckets to slot information + */ + private final List<MemberBucketSlot> memberBucketSlots; + + /** + * Cache of member ids to member IP address and redis listening port + */ + private final Map<String, Pair<String, Integer>> hostPorts = new HashMap<>(); + private final PartitionedRegion dataRegion; + private final Region<String, Object> configRegion; + + SlotAdvisor(Region<RedisKey, RedisData> dataRegion, Region<String, Object> configRegion) { + this.dataRegion = (PartitionedRegion) dataRegion; + this.configRegion = configRegion; + memberBucketSlots = new ArrayList<>(RegionProvider.REDIS_REGION_BUCKETS); + for (int i = 0; i < REDIS_REGION_BUCKETS; i++) { + memberBucketSlots.add(null); + } + } + + public boolean isLocal(RedisKey key) { + return dataRegion.getRegionAdvisor().getBucket(key.getBucketId()).getBucketAdvisor() + .isPrimary(); + } + + public Pair<String, Integer> getHostAndPortForKey(RedisKey key) { + int bucketId = key.getBucketId(); + MemberBucketSlot mbs = updateBucketDetails(bucketId); + + return Pair.of(mbs.getPrimaryIpAddress(), mbs.getPrimaryPort()); + } + + public Map<String, List<Integer>> getMemberBuckets() { + initializeBucketsIfNecessary(); + + Map<String, List<Integer>> memberBuckets = new HashMap<>(); + for (int bucketId = 0; bucketId < REDIS_REGION_BUCKETS; bucketId++) { + String memberId = + dataRegion.getRegionAdvisor().getBucketAdvisor(bucketId).getPrimary().getUniqueId(); + memberBuckets.computeIfAbsent(memberId, k -> new ArrayList<>()).add(bucketId); + } + + return memberBuckets; + } + + public synchronized List<MemberBucketSlot> getBucketSlots() { + initializeBucketsIfNecessary(); + + for (int bucketId = 0; bucketId < REDIS_REGION_BUCKETS; bucketId++) { + updateBucketDetails(bucketId); + } + + return Collections.unmodifiableList(memberBucketSlots); + } + + private synchronized MemberBucketSlot updateBucketDetails(int bucketId) { + MemberBucketSlot mbs = null; + try { + Pair<String, Integer> hostPort = getHostPort(bucketId); + + mbs = memberBucketSlots.get(bucketId); + if (mbs == null) { + mbs = new MemberBucketSlot(bucketId, hostPort.getLeft(), hostPort.getRight()); + memberBucketSlots.set(bucketId, mbs); + } else { + mbs.setPrimaryIpAddress(hostPort.getLeft()); + mbs.setPrimaryPort(hostPort.getRight()); + } + } catch (Exception ex) { + logger.error("Unable to update bucket detail for bucketId: {}", bucketId, ex); + } + + return mbs; + } + + private void initializeBucketsIfNecessary() { + if (dataRegion.getDataStore() != null && + dataRegion.getDataStore().getAllLocalBucketIds().isEmpty()) { + PartitionRegionHelper.assignBucketsToPartitions(dataRegion); + } + } + + @SuppressWarnings("unchecked") Review comment: Why do we need a suppress warnings? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
