You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by hi...@apache.org on 2017/06/19 23:40:59 UTC
[1/7] geode git commit: GEODE-3071: Provide capability to parallelize
distributedTests
Repository: geode
Updated Branches:
refs/heads/feature/GEODE-2804 601b338fd -> cf7274e6c
GEODE-3071: Provide capability to parallelize distributedTests
Herewith the ability to leverage Gradle's parallel test execution
capability to run dunits in parallel. This is combined with launching
tests in Docker containers to provide process, network and filesystem
isolation. Depending on the size of your system, this can speed up
running the distributedTest task 2-5 times.
The capability is enabled by launching gradle with '-PparallelDunit'
Tunables, enabled as gradle parametrs (-P option) are:
- dunitDockerImage: The docker image which will be used to launch
tests. The image must have the JAVA_HOME environment variable set. The
image must be pulled locally before starting the tests.
- dunitParallelForks: The number of parallel docker containers to be
launched.
- dunitDockerUser: The docker user which will run the tests. Because of
the way that the containers map the build directory into them, the
test artifacts, will be written with this user id. By default this is
'root'.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/451bd421
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/451bd421
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/451bd421
Branch: refs/heads/feature/GEODE-2804
Commit: 451bd421a4f0e35a61077461b0744539394452e8
Parents: f808d3b
Author: Jens Deppe <jd...@pivotal.io>
Authored: Wed Jun 14 08:03:22 2017 -0700
Committer: Hitesh Khamesra <hk...@pivotal.io>
Committed: Mon Jun 19 16:39:29 2017 -0700
----------------------------------------------------------------------
build.gradle | 2 ++
gradle.properties | 7 ++++
gradle/docker.gradle | 83 +++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 92 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/451bd421/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index ec6b920..57372b3 100755
--- a/build.gradle
+++ b/build.gradle
@@ -26,6 +26,7 @@ buildscript {
classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.0.1'
classpath "com.diffplug.gradle.spotless:spotless:2.2.0"
classpath "me.champeau.gradle:jmh-gradle-plugin:0.3.1"
+ classpath "com.pedjak.gradle.plugins:dockerized-test:0.4.2"
}
}
@@ -82,6 +83,7 @@ apply from: "${scriptDir}/code-analysis.gradle"
apply from: "${scriptDir}/sonar.gradle"
apply from: "${scriptDir}/ide.gradle"
apply from: "${scriptDir}/rat.gradle"
+apply from: "${scriptDir}/docker.gradle"
subprojects {
// Make sure clean task for rootProject runs last
http://git-wip-us.apache.org/repos/asf/geode/blob/451bd421/gradle.properties
----------------------------------------------------------------------
diff --git a/gradle.properties b/gradle.properties
index ca79a38..9462295 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -49,3 +49,10 @@ buildRoot=
# We want signing to be on by default. Signing requires GPG to be set up.
nexusSignArchives = true
+
+# Control how many concurrent dunit (using docker) tests will be run
+dunitParallelForks = 8
+# This is the name of the Docker image for running parallel dunits
+dunitDockerImage = openjdk:8
+# Docker user for parallel dunit tests
+dunitDockerUser = root
http://git-wip-us.apache.org/repos/asf/geode/blob/451bd421/gradle/docker.gradle
----------------------------------------------------------------------
diff --git a/gradle/docker.gradle b/gradle/docker.gradle
new file mode 100644
index 0000000..7a74c5d
--- /dev/null
+++ b/gradle/docker.gradle
@@ -0,0 +1,83 @@
+/*
+ * Configuration for running (dunit) tests in parallel in Docker containers.
+ * The container used must hava JAVA_HOME set in it's environment and must
+ * have 'java' defined on the path. For example, the relevant Dockerfile
+ * content could be:
+ *
+ * ENV JAVA_HOME=/opt/jdk1.8.0_u101
+ * ENV PATH=$PATH:$JAVA_HOME/bin
+ *
+ * In addition, the container must have docker installed.
+ *
+ * The plugin can be activated with the Gradle property 'parallelDunit'.
+ * Additional properties that can be set are:
+ *
+ * dunitDockerImage - The docker image used for running parallel dunits. The
+ * default image is 'openjdk:8'. The image is required to
+ * have 'JAVA_HOME' set as an environment variable.
+ * dunitParallelForks - The number of parallel containers that will be
+ * launched. The default is 8.
+ * dunitDockerUser - The user used within the docker container to run tests.
+ * The default is 'root'.
+ */
+
+def dockerConfig = {
+ maxParallelForks = dunitParallelForks.toInteger()
+
+ docker {
+ // base image for creating docker containers that execute the tests
+ image = dunitDockerImage
+
+ // volumes mounted to the containers
+ // in a form: host_dir : container_dir
+ def pwd = System.getenv('PWD')
+ def gradleHome = System.getenv('GRADLE_USER_HOME') ?: "${System.getenv('HOME')}/.gradle"
+ volumes = ["${gradleHome}":gradleHome]
+
+ volumes << ["${pwd}":pwd]
+
+ // specify the user for starting Gradle test worker within the container.
+ user = dunitDockerUser
+
+ argsInspect = { List args ->
+ def javaHomeIdx = 0
+ def i = args.iterator()
+ def j = 0
+ while (i.hasNext()) {
+ if (i.next() == '-e') {
+ def x = i.next()
+ j++
+ if (x.startsWith('JAVA_HOME')) {
+ javaHomeIdx = j
+ }
+ }
+ j++
+ }
+
+ // Remove JAVA_HOME env variable - it might not be the same as the container needs
+ if (javaHomeIdx > 0) {
+ args.removeAt(javaHomeIdx-1)
+ args.removeAt(javaHomeIdx-1)
+ }
+
+ // Infer the index of this invocation
+ def matcher = (args[args.size - 1] =~ /.*Executor (\d*).*/)
+
+ args[3] = args[3] + matcher[0][1]
+ def workdir = new File(args[3])
+ println "dockerize: making ${workdir}"
+ workdir.mkdirs()
+ // println args
+
+ args
+ }
+ }
+}
+
+subprojects {
+ apply plugin: 'com.github.pedjak.dockerized-test'
+
+ if (project.hasProperty('parallelDunit')) {
+ distributedTest.configure(dockerConfig)
+ }
+}
[4/7] geode git commit: GEODE_3071: Add Apache license header
Posted by hi...@apache.org.
GEODE_3071: Add Apache license header
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/d4412a68
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/d4412a68
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/d4412a68
Branch: refs/heads/feature/GEODE-2804
Commit: d4412a68889de35f058ede6b030ba92ac6970e23
Parents: 1f78fc4
Author: Jens Deppe <jd...@pivotal.io>
Authored: Fri Jun 16 08:05:32 2017 -0700
Committer: Hitesh Khamesra <hk...@pivotal.io>
Committed: Mon Jun 19 16:39:30 2017 -0700
----------------------------------------------------------------------
gradle/docker.gradle | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/d4412a68/gradle/docker.gradle
----------------------------------------------------------------------
diff --git a/gradle/docker.gradle b/gradle/docker.gradle
index 5c2ef77..b67c073 100644
--- a/gradle/docker.gradle
+++ b/gradle/docker.gradle
@@ -1,4 +1,21 @@
/*
+ * 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.
+ */
+
+/*
* Configuration for running (dunit) tests in parallel in Docker containers.
* The container used must hava JAVA_HOME set in it's environment and must
* have 'java' defined on the path. For example, the relevant Dockerfile
[3/7] geode git commit: GEODE-3092: fix specifiedDefaultValue for
cacheLoader and cacheWriter
Posted by hi...@apache.org.
GEODE-3092: fix specifiedDefaultValue for cacheLoader and cacheWriter
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/15c32d95
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/15c32d95
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/15c32d95
Branch: refs/heads/feature/GEODE-2804
Commit: 15c32d955ecf912c06dbc14f366d2856aede62e2
Parents: 601b338
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Mon Jun 19 09:08:35 2017 -0700
Committer: Hitesh Khamesra <hk...@pivotal.io>
Committed: Mon Jun 19 16:39:29 2017 -0700
----------------------------------------------------------------------
.../CreateAlterDestroyRegionCommands.java | 45 ++++++++++----------
.../internal/cli/GfshParserParsingTest.java | 19 +++++++--
2 files changed, 38 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/15c32d95/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java
index 842802b..bf22854 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java
@@ -14,7 +14,28 @@
*/
package org.apache.geode.management.internal.cli.commands;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.regex.Pattern;
+
+import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+
import org.apache.commons.lang.StringUtils;
+import org.springframework.shell.core.annotation.CliCommand;
+import org.springframework.shell.core.annotation.CliOption;
+
import org.apache.geode.LogWriter;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.ExpirationAttributes;
@@ -58,26 +79,6 @@ import org.apache.geode.management.internal.configuration.domain.XmlEntity;
import org.apache.geode.management.internal.security.ResourceOperation;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
-import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
-import org.springframework.shell.core.annotation.CliCommand;
-import org.springframework.shell.core.annotation.CliOption;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.regex.Pattern;
-import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
/**
* @since GemFire 7.0
@@ -408,9 +409,9 @@ public class CreateAlterDestroyRegionCommands implements GfshCommand {
help = CliStrings.ALTER_REGION__REGIONEXPIRATIONTTLACTION__HELP) String regionExpirationTTLAction,
@CliOption(key = CliStrings.ALTER_REGION__CACHELISTENER, specifiedDefaultValue = "",
help = CliStrings.ALTER_REGION__CACHELISTENER__HELP) String[] cacheListeners,
- @CliOption(key = CliStrings.ALTER_REGION__CACHELOADER, specifiedDefaultValue = "null",
+ @CliOption(key = CliStrings.ALTER_REGION__CACHELOADER, specifiedDefaultValue = "",
help = CliStrings.ALTER_REGION__CACHELOADER__HELP) String cacheLoader,
- @CliOption(key = CliStrings.ALTER_REGION__CACHEWRITER, specifiedDefaultValue = "null",
+ @CliOption(key = CliStrings.ALTER_REGION__CACHEWRITER, specifiedDefaultValue = "",
help = CliStrings.ALTER_REGION__CACHEWRITER__HELP) String cacheWriter,
@CliOption(key = CliStrings.ALTER_REGION__ASYNCEVENTQUEUEID, specifiedDefaultValue = "",
help = CliStrings.ALTER_REGION__ASYNCEVENTQUEUEID__HELP) String[] asyncEventQueueIds,
http://git-wip-us.apache.org/repos/asf/geode/blob/15c32d95/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserParsingTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserParsingTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserParsingTest.java
index 47d150d..961cdf8 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserParsingTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/GfshParserParsingTest.java
@@ -17,15 +17,16 @@ package org.apache.geode.management.internal.cli;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals;
-import org.apache.geode.management.internal.cli.i18n.CliStrings;
-import org.apache.geode.test.dunit.rules.GfshParserRule;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import java.util.Map;
+
import org.junit.ClassRule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.springframework.shell.event.ParseResult;
-import java.util.Map;
+import org.apache.geode.management.internal.cli.i18n.CliStrings;
+import org.apache.geode.test.dunit.rules.GfshParserRule;
+import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
public class GfshParserParsingTest {
@@ -290,4 +291,14 @@ public class GfshParserParsingTest {
GfshParseResult result = parser.parse(command);
assertThat(result.getParamValue("name")).isEqualTo("\\u0005Name");
}
+
+ @Test
+ public void testAlterRegion() throws Exception {
+ String command =
+ "alter region --name=/Person --cache-writer='' --cache-listener='' --cache-loader=''";
+ GfshParseResult result = parser.parse(command);
+ assertThat(result.getParamValue("cache-writer")).isNotNull().isEmpty();
+ assertThat(result.getParamValue("cache-listener")).isNotNull().isEmpty();
+ assertThat(result.getParamValue("cache-loader")).isNotNull().isEmpty();
+ }
}
[5/7] geode git commit: GEODE-3071: Pull config of docker volumes
into top level script so that they can be overridden
Posted by hi...@apache.org.
GEODE-3071: Pull config of docker volumes into top level script so that they can be overridden
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/b18571ae
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/b18571ae
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/b18571ae
Branch: refs/heads/feature/GEODE-2804
Commit: b18571aea9f0c376616f419524f930154432f74e
Parents: d4412a6
Author: Jens Deppe <jd...@pivotal.io>
Authored: Mon Jun 19 07:42:57 2017 -0700
Committer: Hitesh Khamesra <hk...@pivotal.io>
Committed: Mon Jun 19 16:39:30 2017 -0700
----------------------------------------------------------------------
build.gradle | 5 +++++
gradle/docker.gradle | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/b18571ae/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 57372b3..4feb879 100755
--- a/build.gradle
+++ b/build.gradle
@@ -74,6 +74,11 @@ if (name == 'geode') {
ext.scriptDir = 'gradle'
}
+if (project.hasProperty('parallelDunit')) {
+ def pwd = System.getenv('PWD')
+ ext.dunitDockerVolumes = ["${pwd}":pwd]
+}
+
apply from: "${scriptDir}/utilities.gradle"
apply from: "${scriptDir}/java.gradle"
apply from: "${scriptDir}/dependency-resolution.gradle"
http://git-wip-us.apache.org/repos/asf/geode/blob/b18571ae/gradle/docker.gradle
----------------------------------------------------------------------
diff --git a/gradle/docker.gradle b/gradle/docker.gradle
index b67c073..7971974 100644
--- a/gradle/docker.gradle
+++ b/gradle/docker.gradle
@@ -47,11 +47,11 @@ def dockerConfig = {
// volumes mounted to the containers
// in a form: host_dir : container_dir
- def pwd = System.getenv('PWD')
def gradleHome = System.getenv('GRADLE_USER_HOME') ?: "${System.getenv('HOME')}/.gradle"
volumes = ["${gradleHome}":gradleHome]
- volumes << ["${pwd}":pwd]
+ // Add volumes configured by top-level build script
+ volumes << project.dunitDockerVolumes
// specify the user for starting Gradle test worker within the container.
user = dunitDockerUser
[7/7] geode git commit: Remove debug println
Posted by hi...@apache.org.
Remove debug println
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/1f78fc45
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/1f78fc45
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/1f78fc45
Branch: refs/heads/feature/GEODE-2804
Commit: 1f78fc45ee9d8545ce94441daafde96bf9938407
Parents: 451bd42
Author: Jens Deppe <jd...@pivotal.io>
Authored: Thu Jun 15 08:01:46 2017 -0700
Committer: Hitesh Khamesra <hk...@pivotal.io>
Committed: Mon Jun 19 16:39:30 2017 -0700
----------------------------------------------------------------------
gradle/docker.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/1f78fc45/gradle/docker.gradle
----------------------------------------------------------------------
diff --git a/gradle/docker.gradle b/gradle/docker.gradle
index 7a74c5d..5c2ef77 100644
--- a/gradle/docker.gradle
+++ b/gradle/docker.gradle
@@ -65,7 +65,7 @@ def dockerConfig = {
args[3] = args[3] + matcher[0][1]
def workdir = new File(args[3])
- println "dockerize: making ${workdir}"
+ // println "dockerize: making ${workdir}"
workdir.mkdirs()
// println args
[6/7] geode git commit: GEODE-3091: remove empty method
Posted by hi...@apache.org.
GEODE-3091: remove empty method
This closes #585
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/cf7274e6
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/cf7274e6
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/cf7274e6
Branch: refs/heads/feature/GEODE-2804
Commit: cf7274e6c38b156cdc9bbf433475807116150a93
Parents: b18571a
Author: Nick Reich <nr...@pivotal.io>
Authored: Thu Jun 15 15:59:50 2017 -0700
Committer: Hitesh Khamesra <hk...@pivotal.io>
Committed: Mon Jun 19 16:39:30 2017 -0700
----------------------------------------------------------------------
.../geode/internal/cache/DistributedRegion.java | 1 -
.../org/apache/geode/internal/cache/LocalRegion.java | 15 ---------------
.../geode/internal/cache/PartitionedRegion.java | 1 -
3 files changed, 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/cf7274e6/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java
index 9df64d0..21f911d 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java
@@ -935,7 +935,6 @@ public class DistributedRegion extends LocalRegion implements CacheDistributionA
public void invalidate(Object key, Object aCallbackArgument)
throws TimeoutException, EntryNotFoundException {
validateKey(key);
- validateCallbackArg(aCallbackArgument);
checkReadiness();
checkForLimitedOrNoAccess();
Lock dlock = this.getDistributedLockIfGlobal(key);
http://git-wip-us.apache.org/repos/asf/geode/blob/cf7274e6/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
----------------------------------------------------------------------
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 2b45a54..02625ee 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
@@ -1120,7 +1120,6 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory,
@Retained
EntryEventImpl newDestroyEntryEvent(Object key, Object aCallbackArgument) {
validateKey(key);
- validateCallbackArg(aCallbackArgument);
checkReadiness();
checkForLimitedOrNoAccess();
@@ -1349,7 +1348,6 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory,
boolean retainResult) throws TimeoutException, CacheLoaderException {
assert !retainResult || preferCD;
validateKey(key);
- validateCallbackArg(aCallbackArgument);
checkReadiness();
checkForNoAccess();
discoverJTA();
@@ -1563,7 +1561,6 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory,
@Override
public void invalidateRegion(Object aCallbackArgument) throws TimeoutException {
getDataView().checkSupportsRegionInvalidate();
- validateCallbackArg(aCallbackArgument);
checkReadiness();
checkForLimitedOrNoAccess();
RegionEventImpl event = new RegionEventImpl(this, Operation.REGION_INVALIDATE,
@@ -3118,8 +3115,6 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory,
protected void validateArguments(Object key, Object value, Object aCallbackArgument) {
validateKey(key);
validateValue(value);
- validateCallbackArg(aCallbackArgument);
-
}
void validateKey(Object key) {
@@ -3142,15 +3137,6 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory,
}
/**
- * Starting in 3.5, we don't check to see if the callback argument is {@code Serializable}. We
- * instead rely on the actual serialization (which happens in-thread with the put) to tell us if
- * there are any problems. TODO: delete method validateCallbackArg
- */
- void validateCallbackArg(Object aCallbackArgument) {
- // do nothing
- }
-
- /**
* @since GemFire 5.0.2
*/
private final boolean doExpensiveValidations =
@@ -11633,7 +11619,6 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory,
public boolean remove(Object key, Object value, Object callbackArg) {
checkIfConcurrentMapOpsAllowed();
validateKey(key);
- validateCallbackArg(callbackArg);
checkReadiness();
checkForLimitedOrNoAccess();
http://git-wip-us.apache.org/repos/asf/geode/blob/cf7274e6/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
index 288f4a9..cf3ca76 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
@@ -3082,7 +3082,6 @@ public class PartitionedRegion extends LocalRegion
EntryEventImpl clientEvent, boolean returnTombstones)
throws TimeoutException, CacheLoaderException {
validateKey(key);
- validateCallbackArg(aCallbackArgument);
checkReadiness();
checkForNoAccess();
discoverJTA();
[2/7] geode git commit: Update geode-book/README.md
Posted by hi...@apache.org.
Update geode-book/README.md
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/f808d3b6
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/f808d3b6
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/f808d3b6
Branch: refs/heads/feature/GEODE-2804
Commit: f808d3b6fe4bf217160f8569e5b2b4b4289fdd78
Parents: 15c32d9
Author: Dave Barnes <db...@pivotal.io>
Authored: Mon Jun 19 14:07:31 2017 -0700
Committer: Hitesh Khamesra <hk...@pivotal.io>
Committed: Mon Jun 19 16:39:29 2017 -0700
----------------------------------------------------------------------
geode-book/README.md | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/f808d3b6/geode-book/README.md
----------------------------------------------------------------------
diff --git a/geode-book/README.md b/geode-book/README.md
index f381b16..a542ce2 100644
--- a/geode-book/README.md
+++ b/geode-book/README.md
@@ -78,12 +78,22 @@ where `XY` is the product version of your documentation (e.g., `{geode-site}/web
2. Navigate to the User Guide you have built in the Geode repository: `{geode-project-dir}/geode-book/final_app/public/docs/guide/XY`.
-3. Use `tar` to copy the directory in order to preserve links and other filesystem niceties. Create the tarfile in your Desktop for easy access on the retrieval side.
-
- To copy the directory, enter:
+3. Use `tar` to copy the directory in order to preserve links and other filesystem niceties.
+
+ a. Create the tarfile in your Desktop for easy access on the retrieval side.
```
$ tar cvf ~/Desktop/new-guide-content.tar .
+ ```
+ b. Create the destination directory in the `geode-site` repo:
+
+ ```
+ $ mkdir -p {geode-site}/website/content/docs/guide/XY
+ ```
+
+ c. Navigate to the target directory and un-tar the userguide archive:
+
+ ```
$ cd {geode-site}/website/content/docs/guide/XY
$ tar xvf ~/Desktop/new-guide-content.tar
```