You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by sb...@apache.org on 2015/09/11 00:51:57 UTC
[1/2] incubator-geode git commit: GEODE-313 Improve redis adpater
region exception handling
Repository: incubator-geode
Updated Branches:
refs/heads/develop 1517f88fd -> 391a93d59
GEODE-313 Improve redis adpater region exception handling
When creating regions for sorted sets, better handling of index creation
exceptions now correctly deals with possible errors. Also, error logging
from the RegionProvider class has been removed.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/c1de3fec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/c1de3fec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/c1de3fec
Branch: refs/heads/develop
Commit: c1de3fec4e7937669c0ce39bbdeb77a597414b16
Parents: ba74e9e
Author: Vito Gavrilov <vg...@pivotal.io>
Authored: Tue Sep 8 10:55:12 2015 -0700
Committer: Vito Gavrilov <vg...@pivotal.io>
Committed: Tue Sep 8 10:55:12 2015 -0700
----------------------------------------------------------------------
.../gemfire/internal/redis/RegionProvider.java | 44 ++++++++++----------
1 file changed, 23 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c1de3fec/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/RegionProvider.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/RegionProvider.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/RegionProvider.java
index cadaf5f..0240a4c 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/RegionProvider.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/redis/RegionProvider.java
@@ -13,12 +13,13 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
-import com.gemstone.gemfire.LogWriter;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheTransactionManager;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionShortcut;
import com.gemstone.gemfire.cache.TransactionId;
+import com.gemstone.gemfire.cache.query.IndexExistsException;
+import com.gemstone.gemfire.cache.query.IndexInvalidException;
import com.gemstone.gemfire.cache.query.IndexNameConflictException;
import com.gemstone.gemfire.cache.query.Query;
import com.gemstone.gemfire.cache.query.QueryInvalidException;
@@ -75,7 +76,6 @@ public class RegionProvider implements Closeable {
private final RegionShortcut defaultRegionType;
private static final CreateAlterDestroyRegionCommands cliCmds = new CreateAlterDestroyRegionCommands();
private final ConcurrentHashMap<String, Lock> locks;
- private final LogWriter logger;
public RegionProvider(Region<ByteArrayWrapper, ByteArrayWrapper> stringsRegion, Region<ByteArrayWrapper, HyperLogLogPlus> hLLRegion, Region<String, RedisDataType> redisMetaRegion, ConcurrentMap<ByteArrayWrapper, ScheduledFuture<?>> expirationsMap, ScheduledExecutorService expirationExecutor, RegionShortcut defaultShortcut) {
if (stringsRegion == null || hLLRegion == null || redisMetaRegion == null)
@@ -90,7 +90,6 @@ public class RegionProvider implements Closeable {
this.expirationExecutor = expirationExecutor;
this.defaultRegionType = defaultShortcut;
this.locks = new ConcurrentHashMap<String, Lock>();
- this.logger = this.cache.getLogger();
}
public boolean existsKey(ByteArrayWrapper key) {
@@ -219,11 +218,16 @@ public class RegionProvider implements Closeable {
// simply ignore. Calls to getRegion or getOrCreate will work correctly
if (r == null)
return;
-
- if (type == RedisDataType.REDIS_LIST)
+
+ if (type == RedisDataType.REDIS_LIST) {
doInitializeList(key, r);
- else if (type == RedisDataType.REDIS_SORTEDSET)
- doInitializeSortedSet(key, r);
+ } else if (type == RedisDataType.REDIS_SORTEDSET) {
+ try {
+ doInitializeSortedSet(key, r);
+ } catch (RegionNotFoundException | IndexInvalidException e) {
+ //ignore
+ }
+ }
this.regions.put(key, r);
}
} finally {
@@ -266,10 +270,15 @@ public class RegionProvider implements Closeable {
concurrentCreateDestroyException = null;
r = createRegionGlobally(stringKey);
try {
- if (type == RedisDataType.REDIS_LIST)
+ if (type == RedisDataType.REDIS_LIST) {
doInitializeList(key, r);
- else if (type == RedisDataType.REDIS_SORTEDSET)
- doInitializeSortedSet(key, r);
+ } else if (type == RedisDataType.REDIS_SORTEDSET) {
+ try {
+ doInitializeSortedSet(key, r);
+ } catch (RegionNotFoundException | IndexInvalidException e) {
+ concurrentCreateDestroyException = e;
+ }
+ }
} catch (QueryInvalidException e) {
if (e.getCause() instanceof RegionNotFoundException) {
concurrentCreateDestroyException = e;
@@ -326,17 +335,13 @@ public class RegionProvider implements Closeable {
this.regions.remove(key);
}
- private void doInitializeSortedSet(ByteArrayWrapper key, Region<?, ?> r) {
+ private void doInitializeSortedSet(ByteArrayWrapper key, Region<?, ?> r) throws RegionNotFoundException, IndexInvalidException {
String fullpath = r.getFullPath();
try {
queryService.createIndex("scoreIndex", "entry.value.score", r.getFullPath() + ".entrySet entry");
queryService.createIndex("scoreIndex2", "value.score", r.getFullPath() + ".values value");
- } catch (Exception e) {
- if (!(e instanceof IndexNameConflictException)) {
- if (logger.errorEnabled()) {
- logger.error(e);
- }
- }
+ } catch (IndexNameConflictException | IndexExistsException | UnsupportedOperationException e) {
+ // ignore, these indexes already exist or unsupported but make sure prepared queries are made
}
HashMap<Enum<?>, Query> queryList = new HashMap<Enum<?>, Query>();
for (SortedSetQuery lq: SortedSetQuery.values()) {
@@ -379,9 +384,6 @@ public class RegionProvider implements Closeable {
String err = "";
while(result.hasNextLine())
err += result.nextLine();
- if (this.logger.errorEnabled()) {
- this.logger.error("Region creation failure- "+ err);
- }
throw new RegionCreationException(err);
}
} while(r == null); // The region can be null in the case that it is concurrently destroyed by
@@ -397,7 +399,7 @@ public class RegionProvider implements Closeable {
} else {
return this.queryService.newQuery(((SortedSetQuery)query).getQueryString(this.regions.get(key).getFullPath()));
}
- */
+ */
}
/**
[2/2] incubator-geode git commit: Merge branch 'feature/GEODE-313'
into develop This closes #19
Posted by sb...@apache.org.
Merge branch 'feature/GEODE-313' into develop
This closes #19
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/391a93d5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/391a93d5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/391a93d5
Branch: refs/heads/develop
Commit: 391a93d591c02c2b122f878c8e34fc4de10a0f40
Parents: 1517f88 c1de3fe
Author: Swapnil Bawaskar <sb...@pivotal.io>
Authored: Thu Sep 10 12:06:59 2015 -0700
Committer: Swapnil Bawaskar <sb...@pivotal.io>
Committed: Thu Sep 10 12:07:55 2015 -0700
----------------------------------------------------------------------
.../gemfire/internal/redis/RegionProvider.java | 44 ++++++++++----------
1 file changed, 23 insertions(+), 21 deletions(-)
----------------------------------------------------------------------