You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by zh...@apache.org on 2018/03/07 07:01:03 UTC
[geode] branch feature/GEODE-4788 updated (e72384b -> 378d97a)
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a change to branch feature/GEODE-4788
in repository https://gitbox.apache.org/repos/asf/geode.git.
omit e72384b GEODE-4788: change back the behavior of test code of getSomeKeys to ignore exceptions.
add ef1ebdf GEODE-4781: Categorize Lucene Tests (#1562)
add 4f0c5c9 GEODE-4775: Apply ArgumentRedactor to JVM arguments.
add 00e2a45 GEODE-4777: Add UITest job to concourse develop pipeline (#1561)
add ef8fa1a GEODE-4776: Migrate to chrome driver for Pulse UI Tests (#1549)
add 1a69ddc GEODE-4781: Converted LuceneTest to an interface
add eb8f840 GEODE-4787: Re-instate Management REST API endpoints for 'create index' and 'create region'. (#1563)
new 378d97a GEODE-4788: change back the behavior of test code of getSomeKeys to ignore exceptions.
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (e72384b)
\
N -- N -- N refs/heads/feature/GEODE-4788 (378d97a)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
ci/docker/Dockerfile | 17 +-
...cribeConfigAreFullyRedactedAcceptanceTest.java} | 82 ++-
.../internal/locator/LocatorStatusResponse.java | 2 +-
.../java/org/apache/geode/internal/Banner.java | 3 +-
.../geode/internal/util/ArgumentRedactor.java | 5 +
.../cli/commands/DescribeConfigCommand.java | 5 +-
.../cli/domain/MemberConfigurationInfo.java | 17 +-
.../GetMemberConfigInformationFunction.java | 3 +-
.../web/controllers/ShellCommandsController.java | 47 ++
.../cache/PartitionedRegionGetSomeKeys.java | 4 +-
.../{RestAPITest.java => LuceneTest.java} | 5 +-
.../geode/cache/lucene/EvictionDUnitTest.java | 3 +-
.../geode/cache/lucene/ExpirationDUnitTest.java | 3 +-
.../lucene/FlatFormatPdxSerializerJunitTest.java | 3 +-
.../lucene/FlatFormatSerializerJUnitTest.java | 3 +-
.../lucene/LuceneClientSecurityDUnitTest.java | 3 +-
.../lucene/LuceneCommandsSecurityDUnitTest.java | 3 +-
.../apache/geode/cache/lucene/LuceneDUnitTest.java | 1 +
.../cache/lucene/LuceneIndexCreationDUnitTest.java | 3 +-
.../lucene/LuceneIndexCreationIntegrationTest.java | 3 +-
.../LuceneIndexCreationOffHeapIntegrationTest.java | 3 +-
.../LuceneIndexCreationOnFixedPRDUnitTest.java | 3 +-
...eneIndexCreationPersistenceIntegrationTest.java | 3 +-
.../cache/lucene/LuceneIndexDestroyDUnitTest.java | 3 +-
.../LuceneIndexMaintenanceIntegrationTest.java | 3 +-
.../geode/cache/lucene/LuceneIntegrationTest.java | 1 +
.../cache/lucene/LuceneQueriesClientDUnitTest.java | 3 +-
.../geode/cache/lucene/LuceneQueriesDUnitTest.java | 3 +-
.../cache/lucene/LuceneQueriesIntegrationTest.java | 3 +-
.../LuceneQueriesPersistenceIntegrationTest.java | 3 +-
.../LuceneQueriesReindexClientDUnitTest.java | 3 +-
.../lucene/LuceneQueriesReindexDUnitTest.java | 3 +-
...hRegionCreatedBeforeReindexClientDUnitTest.java | 3 +-
...iesWithRegionCreatedBeforeReindexDUnitTest.java | 3 +-
...hRegionCreatedBeforeReindexIntegrationTest.java | 3 +-
...eriesWithReindexFlagEnabledClientDUnitTest.java | 3 +-
...ceneQueriesWithReindexFlagEnabledDUnitTest.java | 3 +-
...eriesWithReindexFlagEnabledIntegrationTest.java | 3 +-
.../cache/lucene/MixedObjectIndexDUnitTest.java | 3 +-
.../NestedObjectSeralizerIntegrationTest.java | 3 +-
.../geode/cache/lucene/PaginationDUnitTest.java | 3 +-
.../geode/cache/lucene/RebalanceDUnitTest.java | 3 +-
.../lucene/RebalanceWithRedundancyDUnitTest.java | 3 +-
.../internal/LuceneEventListenerJUnitTest.java | 3 +-
.../LuceneIndexCreationProfileJUnitTest.java | 3 +-
.../internal/LuceneIndexFactoryImplJUnitTest.java | 3 +-
.../LuceneIndexForPartitionedRegionTest.java | 3 +-
.../lucene/internal/LuceneIndexImplJUnitTest.java | 3 +-
.../LuceneIndexRecoveryHAIntegrationTest.java | 3 +-
.../lucene/internal/LuceneIndexStatsJUnitTest.java | 3 +-
.../internal/LuceneQueryFactoryImplJUnitTest.java | 3 +-
.../lucene/internal/LuceneQueryImplJUnitTest.java | 3 +-
.../internal/LuceneRegionListenerJUnitTest.java | 3 +-
.../internal/LuceneResultStructImpJUnitTest.java | 4 +-
.../internal/LuceneServiceImplIntegrationTest.java | 3 +-
.../internal/LuceneServiceImplJUnitTest.java | 3 +-
.../PageableLuceneQueryResultsImplJUnitTest.java | 3 +-
.../PartitionedRepositoryManagerJUnitTest.java | 3 +-
.../RawLuceneRepositoryManagerJUnitTest.java | 1 +
.../internal/StringQueryProviderJUnitTest.java | 3 +-
.../internal/ValidateCommandParametersTest.java | 4 +-
.../internal/cli/LuceneIndexCommandsDUnitTest.java | 3 +-
.../internal/cli/LuceneIndexCommandsJUnitTest.java | 3 +-
...neIndexCommandsWithReindexAllowedDUnitTest.java | 1 +
.../LuceneCreateIndexFunctionJUnitTest.java | 3 +-
.../LuceneDescribeIndexFunctionJUnitTest.java | 3 +-
.../LuceneDestroyIndexFunctionJUnitTest.java | 3 +-
.../LuceneListIndexFunctionJUnitTest.java | 3 +-
.../LuceneSearchIndexFunctionJUnitTest.java | 3 +-
.../LuceneClusterConfigurationDUnitTest.java | 3 +-
...onWhereRegionCreatedBeforeReindexDUnitTest.java | 3 +-
.../DumpDirectoryFilesIntegrationTest.java | 3 +-
.../directory/DumpDirectoryFilesJUnitTest.java | 3 +-
.../directory/RegionDirectoryJUnitTest.java | 3 +-
.../distributed/DistributedScoringJUnitTest.java | 3 +-
.../internal/distributed/EntryScoreJUnitTest.java | 3 +-
.../LuceneQueryFunctionContextJUnitTest.java | 3 +-
.../distributed/LuceneQueryFunctionJUnitTest.java | 3 +-
.../distributed/TopEntriesCollectorJUnitTest.java | 3 +-
.../TopEntriesFunctionCollectorJUnitTest.java | 3 +-
.../internal/distributed/TopEntriesJUnitTest.java | 3 +-
.../WaitUntilFlushedFunctionJUnitTest.java | 3 +-
.../internal/filesystem/ChunkKeyJUnitTest.java | 3 +-
.../lucene/internal/filesystem/FileJUnitTest.java | 3 +-
.../internal/filesystem/FileSystemJUnitTest.java | 3 +-
.../filesystem/FileSystemStatsJUnitTest.java | 3 +-
.../management/LuceneManagementDUnitTest.java | 3 +-
.../BucketTargetingFixedResolverTest.java | 3 +-
.../internal/partition/BucketTargetingMapTest.java | 3 +-
.../repository/IndexRepositoryImplJUnitTest.java | 3 +-
.../IndexRepositoryImplPerformanceTest.java | 3 +-
.../repository/LuceneIndexMemoryOverheadTest.java | 3 +-
.../HeterogeneousLuceneSerializerJUnitTest.java | 3 +-
.../serializer/PdxFieldMapperJUnitTest.java | 3 +-
.../serializer/ReflectionFieldMapperJUnitTest.java | 4 +-
.../results/LuceneGetPageFunctionJUnitTest.java | 3 +-
.../internal/results/PageEntryJUnitTest.java | 3 +-
.../internal/results/PageResultsJUnitTest.java | 3 +-
...uceneIndexXmlGeneratorIntegrationJUnitTest.java | 3 +-
.../xml/LuceneIndexXmlGeneratorJUnitTest.java | 3 +-
...onCreatedBeforeReindexIntegrationJUnitTest.java | 3 +-
...WithReindexFlagEnabledIntegrationJUnitTest.java | 3 +-
.../LuceneIndexXmlParserIntegrationJUnitTest.java | 3 +-
.../xml/LuceneIndexXmlParserJUnitTest.java | 3 +-
.../lucene/test/LuceneFunctionSecurityTest.java | 3 +-
.../AnalyzeLuceneSerializablesJUnitTest.java | 4 +-
geode-pulse/build.gradle | 7 +-
.../geode/tools/pulse/internal/data/Cluster.java | 775 +--------------------
.../tools/pulse/internal/data/IClusterUpdater.java | 3 +-
.../pulse/testbed/GemFireDistributedSystem.java | 319 ---------
.../geode/tools/pulse/testbed/GemfireTopology.java | 22 -
.../geode/tools/pulse/testbed/PropFileHelper.java | 112 ---
.../tools/pulse/testbed/PropMockDataUpdater.java | 502 -------------
.../apache/geode/tools/pulse/testbed/TestBed.java | 82 ---
.../org/apache/geode/tools/pulse/tests/Member.java | 5 -
.../geode/tools/pulse/tests/MemberMBean.java | 2 -
.../geode/tools/pulse/tests/rules/ServerRule.java | 1 +
.../tools/pulse/tests/rules/WebDriverRule.java | 16 +-
.../pulse/tests/ui/PulseAnonymousUserTest.java | 5 +-
.../tools/pulse/tests/ui/PulseAutomatedTest.java | 4 +
gradle/dependency-versions.properties | 3 +-
gradle/test.gradle | 10 +
122 files changed, 367 insertions(+), 1972 deletions(-)
rename geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/{LogsAreFullyRedactedAcceptanceTest.java => LogsAndDescribeConfigAreFullyRedactedAcceptanceTest.java} (59%)
copy geode-junit/src/main/java/org/apache/geode/test/junit/categories/{RestAPITest.java => LuceneTest.java} (91%)
mode change 100755 => 100644
mode change 100755 => 100644 geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesClientDUnitTest.java
mode change 100755 => 100644 geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesWithRegionCreatedBeforeReindexClientDUnitTest.java
mode change 100755 => 100644 geode-lucene/src/test/java/org/apache/geode/cache/lucene/LuceneQueriesWithReindexFlagEnabledClientDUnitTest.java
mode change 100755 => 100644 geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/LuceneIndexImplJUnitTest.java
mode change 100755 => 100644 geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/RawLuceneRepositoryManagerJUnitTest.java
mode change 100755 => 100644 geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsDUnitTest.java
mode change 100755 => 100644 geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/configuration/LuceneClusterConfigurationDUnitTest.java
mode change 100755 => 100644 geode-lucene/src/test/java/org/apache/geode/codeAnalysis/AnalyzeLuceneSerializablesJUnitTest.java
delete mode 100644 geode-pulse/src/test/java/org/apache/geode/tools/pulse/testbed/GemFireDistributedSystem.java
delete mode 100644 geode-pulse/src/test/java/org/apache/geode/tools/pulse/testbed/GemfireTopology.java
delete mode 100644 geode-pulse/src/test/java/org/apache/geode/tools/pulse/testbed/PropFileHelper.java
delete mode 100644 geode-pulse/src/test/java/org/apache/geode/tools/pulse/testbed/PropMockDataUpdater.java
delete mode 100644 geode-pulse/src/test/java/org/apache/geode/tools/pulse/testbed/TestBed.java
--
To stop receiving notification emails like this one, please contact
zhouxj@apache.org.
[geode] 01/01: GEODE-4788: change back the behavior of test code of
getSomeKeys to ignore exceptions.
Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a commit to branch feature/GEODE-4788
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 378d97aed9f23c237b9616c78e17bdb1fea2c21f
Author: zhouxh <gz...@pivotal.io>
AuthorDate: Tue Mar 6 12:11:52 2018 -0800
GEODE-4788: change back the behavior of test code of getSomeKeys to ignore exceptions.
---
.../cache/PartitionedRegionGetSomeKeys.java | 23 ++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionGetSomeKeys.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionGetSomeKeys.java
index bcce7df..a02dedb 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionGetSomeKeys.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionGetSomeKeys.java
@@ -20,17 +20,22 @@ import java.util.Collections;
import java.util.Random;
import java.util.Set;
+import org.apache.logging.log4j.Logger;
+
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.partitioned.FetchKeysMessage;
import org.apache.geode.internal.cache.partitioned.FetchKeysMessage.FetchKeysResponse;
import org.apache.geode.internal.cache.partitioned.PRLocallyDestroyedException;
import org.apache.geode.internal.cache.tier.InterestType;
+import org.apache.geode.internal.logging.LogService;
/**
* Extracted from {@link PartitionedRegion}. This is a utility used by Hydra test code only.
*/
public class PartitionedRegionGetSomeKeys {
+ private static final Logger logger = LogService.getLogger();
+
/**
* Test Method: Get a random set of keys from a randomly selected bucket using the provided
* {@code Random} number generator.
@@ -42,7 +47,8 @@ public class PartitionedRegionGetSomeKeys {
Set<Integer> bucketIdSet = partitionedRegion.getRegionAdvisor().getBucketSet();
if (bucketIdSet != null && !bucketIdSet.isEmpty()) {
- Integer[] bucketIds = bucketIdSet.toArray(new Integer[bucketIdSet.size()]);
+ Object[] bucketIds = bucketIdSet.toArray();
+ Integer bucketId = null;
Set<?> someKeys;
// Randomly pick a node to get some data from
@@ -53,7 +59,7 @@ public class PartitionedRegionGetSomeKeys {
// The GSRandom.nextInt(int) may return a value that includes the maximum.
whichBucket = bucketIds.length - 1;
}
- int bucketId = bucketIds[whichBucket];
+ bucketId = (Integer) bucketIds[whichBucket];
InternalDistributedMember member = partitionedRegion.getNodeForBucketRead(bucketId);
if (member != null) {
@@ -70,8 +76,17 @@ public class PartitionedRegionGetSomeKeys {
return someKeys;
}
}
- } catch (ForceReattemptException | PRLocallyDestroyedException e) {
- throw new RuntimeException(e);
+ } catch (ForceReattemptException movinOn) {
+ partitionedRegion.checkReadiness();
+ logger.debug(
+ "Test hook getSomeKeys caught a ForceReattemptException for bucketId={}{}{}. Moving on to another bucket",
+ partitionedRegion.getPRId(), partitionedRegion.BUCKET_ID_SEPARATOR, bucketId,
+ movinOn);
+ continue;
+ } catch (PRLocallyDestroyedException ignore) {
+ logger.debug("getSomeKeys: Encountered PRLocallyDestroyedException");
+ partitionedRegion.checkReadiness();
+ continue;
}
}
}
--
To stop receiving notification emails like this one, please contact
zhouxj@apache.org.