This is an automated email from the ASF dual-hosted git repository.
boglesby pushed a commit to branch feature/GEODE-5145
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 4a58d458b9f711a8a0b1592796f4d4db83de853e
Author: Barry Oglesby <bogle...@pivotal.io>
AuthorDate: Mon May 14 13:17:08 2018 -0700
GEODE-5145: Incorporated review comments
---
.../java/org/apache/geode/internal/cache/LocalRegion.java | 4 ----
.../org/apache/geode/internal/i18n/LocalizedStrings.java | 2 ++
.../org/apache/geode/management/internal/cli/CliUtil.java | 13 -------------
.../apache/geode/cache/lucene/internal/LuceneIndexImpl.java | 7 +++----
.../geode/cache/lucene/internal/LuceneRegionListener.java | 8 +++++++-
.../geode/cache/lucene/internal/LuceneServiceImpl.java | 3 ++-
.../cache/lucene/internal/cli/LuceneIndexCommands.java | 6 +++---
.../lucene/internal/cli/LuceneIndexCommandsJUnitTest.java | 4 ++--
8 files changed, 19 insertions(+), 28 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
index 626f9e8..ec65991 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
@@ -10497,10 +10497,6 @@ public class LocalRegion extends AbstractRegion
implements LoaderHelperFactory,
this.cacheServiceProfiles.put(profile.getId(), profile);
}
- public void removeCacheServiceProfile(String profileId) {
- this.cacheServiceProfiles.remove(profileId);
- }
-
@Override
public LoaderHelper createLoaderHelper(Object key, Object callbackArgument,
boolean netSearchAllowed, boolean netLoadAllowed,
SearchLoadAndWriteProcessor searcher) {
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java
b/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java
index 3552018..dc034ae 100755
---
a/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java
@@ -7716,6 +7716,8 @@ public class LocalizedStrings {
public static final StringId
LuceneIndexCreation_INDEX_CANNOT_BE_CREATED_DUE_TO_PROFILE_VIOLATION =
new StringId(6667,
"Lucene index {0} cannot be created because its parameters are
incompatible with another Lucene index");
+ public static final StringId
LuceneIndexCreation_INDEX_WAS_DESTROYED_WHILE_BEING_CREATED =
+ new StringId(6668, "Lucene index {0} on region {1} was destroyed while
being created");
/** Testing strings, messageId 90000-99999 **/
/**
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliUtil.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliUtil.java
index 8634145..647a495 100755
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliUtil.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliUtil.java
@@ -198,19 +198,6 @@ public class CliUtil {
}
/**
- * Returns a set of all the members of the distributed system older than a
specific version
- * excluding locators.
- */
- @SuppressWarnings("unchecked")
- public static Set<DistributedMember>
getNormalMembersWithSameOrOlderVersion(InternalCache cache,
- Version version) {
- return getAllNormalMembers(cache).stream()
- .filter(member -> ((InternalDistributedMember)
member).getVersionObject().equals(version))
- .collect(Collectors.toSet());
- // dm.removeMembersWithSameOrNewerVersion(oldMembers, version);
- }
-
- /**
* Returns a set of all the members of the distributed system including
locators.
*/
@SuppressWarnings("unchecked")
diff --git
a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexImpl.java
b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexImpl.java
index f06fd91..bc988f5 100644
---
a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexImpl.java
+++
b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexImpl.java
@@ -226,10 +226,6 @@ public abstract class LuceneIndexImpl implements
InternalLuceneIndex {
getDataRegion().getExtensionPoint().removeExtension(extensionToDelete);
}
- // Remove cache service profile
- dataRegion
-
.removeCacheServiceProfile(LuceneIndexCreationProfile.generateId(indexName,
regionPath));
-
// Destroy the async event queue
destroyAsyncEventQueue(initiator);
@@ -241,6 +237,9 @@ public abstract class LuceneIndexImpl implements
InternalLuceneIndex {
cache.removeRegionListener(listenerToRemove);
}
+ // Remove cache service profile
+ dataRegion
+
.removeCacheServiceProfile(LuceneIndexCreationProfile.generateId(indexName,
regionPath));
}
private RegionListener getRegionListener() {
diff --git
a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneRegionListener.java
b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneRegionListener.java
index 7977670..d7211e7 100644
---
a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneRegionListener.java
+++
b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneRegionListener.java
@@ -17,6 +17,7 @@ package org.apache.geode.cache.lucene.internal;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.logging.log4j.Logger;
import org.apache.lucene.analysis.Analyzer;
import org.apache.geode.cache.AttributesFactory;
@@ -28,6 +29,8 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.InternalRegionArguments;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.RegionListener;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.logging.LogService;
public class LuceneRegionListener implements RegionListener {
@@ -53,6 +56,8 @@ public class LuceneRegionListener implements RegionListener {
private AtomicBoolean afterCreateInvoked = new AtomicBoolean();
+ private static final Logger logger = LogService.getLogger();
+
public LuceneRegionListener(LuceneServiceImpl service, InternalCache cache,
String indexName,
String regionPath, String[] fields, Analyzer analyzer, Map<String,
Analyzer> fieldAnalyzers,
LuceneSerializer serializer) {
@@ -111,7 +116,8 @@ public class LuceneRegionListener implements RegionListener
{
try {
this.service.afterDataRegionCreated(this.luceneIndex);
} catch (LuceneIndexDestroyedException e) {
- // @todo log a warning here?
+
logger.warn(LocalizedStrings.LuceneIndexCreation_INDEX_WAS_DESTROYED_WHILE_BEING_CREATED
+ .toString(indexName, regionPath));
return;
}
this.service.createLuceneIndexOnDataRegion((PartitionedRegion) region,
luceneIndex);
diff --git
a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java
b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java
index ccb3d06..bd3b8ee 100644
---
a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java
+++
b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneServiceImpl.java
@@ -269,7 +269,8 @@ public class LuceneServiceImpl implements
InternalLuceneService {
try {
afterDataRegionCreated(luceneIndex);
} catch (LuceneIndexDestroyedException e) {
- // @todo log a warning here?
+
logger.warn(LocalizedStrings.LuceneIndexCreation_INDEX_WAS_DESTROYED_WHILE_BEING_CREATED
+ .toString(indexName, regionPath));
return;
}
diff --git
a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java
b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java
index 064c42a..f6b6c41 100755
---
a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java
+++
b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java
@@ -288,13 +288,13 @@ public class LuceneIndexCommands extends
InternalGfshCommand {
authorize(Resource.CLUSTER, Operation.MANAGE, LucenePermission.TARGET);
- // Get members >= 1.6
+ // Get members >= 1.7
Set<DistributedMember> validVersionMembers =
- getNormalMembersWithSameOrNewerVersion(Version.GEODE_160);
+ getNormalMembersWithSameOrNewerVersion(Version.GEODE_170);
if (validVersionMembers.isEmpty()) {
return ResultBuilder.createInfoResult(CliStrings.format(
LuceneCliStrings.LUCENE_DESTROY_INDEX__MSG__COULD_NOT_FIND__MEMBERS_GREATER_THAN_VERSION_0,
- Version.GEODE_160));
+ Version.GEODE_170));
}
// Execute the destroy index function
diff --git
a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java
b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java
index 46a7e5e..b5ef074 100644
---
a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java
+++
b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java
@@ -435,7 +435,7 @@ public class LuceneIndexCommandsJUnitTest {
final List<CliFunctionResult> cliFunctionResults = new ArrayList<>();
String expectedStatus = CliStrings.format(
LuceneCliStrings.LUCENE_DESTROY_INDEX__MSG__COULD_NOT_FIND__MEMBERS_GREATER_THAN_VERSION_0,
- new Object[] {Version.GEODE_160}) + LINE_SEPARATOR;
+ new Object[] {Version.GEODE_170}) + LINE_SEPARATOR;
cliFunctionResults.add(new CliFunctionResult("member0"));
doReturn(Collections.emptySet()).when(commands).getNormalMembersWithSameOrNewerVersion(any());
CommandResult result = (CommandResult) commands.destroyIndex("index",
"regionPath");
@@ -485,7 +485,7 @@ public class LuceneIndexCommandsJUnitTest {
final List<CliFunctionResult> cliFunctionResults = new ArrayList<>();
String expectedStatus = CliStrings.format(
LuceneCliStrings.LUCENE_DESTROY_INDEX__MSG__COULD_NOT_FIND__MEMBERS_GREATER_THAN_VERSION_0,
- new Object[] {Version.GEODE_160}) + LINE_SEPARATOR;
+ new Object[] {Version.GEODE_170}) + LINE_SEPARATOR;
cliFunctionResults.add(new CliFunctionResult("member0"));
CommandResult result = (CommandResult) commands.destroyIndex(null,
"regionPath");
verifyDestroyIndexCommandResult(result, cliFunctionResults,
expectedStatus);
--
To stop receiving notification emails like this one, please contact
bogle...@apache.org.
