This is an automated email from the ASF dual-hosted git repository. echobravo pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode-native.git
commit 8b383029f898e78e0e1301a4463648d67f7268c1 Author: Ryan McMahon <rmcma...@pivotal.io> AuthorDate: Tue Feb 20 13:28:22 2018 -0800 GEODE-4697: Removing FunctionExecutionTimeout from server configs Signed-off-by: Michael Oleske <mole...@pivotal.io> --- .../integration-test/func_cacheserver1_pool.xml | 138 ++++++++++----------- .../integration-test/func_cacheserver2_pool.xml | 135 ++++++++++---------- .../integration-test/func_cacheserver3_pool.xml | 120 +++++++++--------- 3 files changed, 184 insertions(+), 209 deletions(-) diff --git a/clicache/integration-test/func_cacheserver1_pool.xml b/clicache/integration-test/func_cacheserver1_pool.xml index 039750d..820faa5 100644 --- a/clicache/integration-test/func_cacheserver1_pool.xml +++ b/clicache/integration-test/func_cacheserver1_pool.xml @@ -1,5 +1,4 @@ <?xml version="1.0"?> - <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -16,79 +15,72 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - -<cache xmlns="http://geode.apache.org/schema/cache" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd" - version="1.0"> +<cache + xmlns="http://geode.apache.org/schema/cache" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd" version="1.0"> <!--cache-server host="cod" port="24680" /--> - <cache-server port="HOST_PORT1"> - <group>ServerGroup1</group> + <cache-server port="HOST_PORT1"> + <group>ServerGroup1</group> </cache-server> - <pdx read-serialized="true" /> - <region name='partition_region'> - <region-attributes data-policy="partition" > - <partition-attributes redundant-copies="1" startup-recovery-delay="1"/> + <pdx read-serialized="true" /> + <region name='partition_region'> + <region-attributes data-policy="partition"> + <partition-attributes redundant-copies="1" startup-recovery-delay="1"/> </region-attributes> </region> - <function-service> - <function> - <class-name>javaobject.MultiGetFunctionI</class-name> - </function> - <function> - <class-name>javaobject.MultiPutFunctionI</class-name> - </function> - <function> - <class-name>javaobject.MultiGetFunction</class-name> - </function> - <function> - <class-name>javaobject.MultiGetFunction2</class-name> - </function> - <function> - <class-name>javaobject.MultiPutFunction</class-name> - </function> - <function> - <class-name>javaobject.RegionOperationsFunction</class-name> - </function> - <function> - <class-name>javaobject.RegionOperationsHAFunction</class-name> - </function> - <function> - <class-name>javaobject.ExceptionHandlingFunction</class-name> - </function> - <function> - <class-name>javaobject.OnServerHAExceptionFunction</class-name> - </function> - <function> - <class-name>javaobject.OnServerHAShutdownFunction</class-name> - </function> - <function> - <class-name>javaobject.PdxFunctionTest</class-name> - </function> - <function> - <class-name>javaobject.SingleStrGetFunction</class-name> - </function> - <function> - <class-name>javaobject.executeFunction_SendException</class-name> - </function> - <function> - <class-name>javaobject.FEOnRegionPrSHOP</class-name> - </function> - <function> - <class-name>javaobject.FEOnRegionPrSHOP_OptimizeForWrite</class-name> - </function> - <function> - <class-name>javaobject.RegionOperationsHAFunctionPrSHOP</class-name> - </function> - <function> - <class-name>javaobject.FunctionExecutionTimeOut</class-name> - </function> - </function-service> - <serialization-registration> - <instantiator id="5200" > - <class-name>javaobject.InstantiatorTest</class-name> - </instantiator> - </serialization-registration> -</cache> + <function-service> + <function> + <class-name>javaobject.MultiGetFunctionI</class-name> + </function> + <function> + <class-name>javaobject.MultiPutFunctionI</class-name> + </function> + <function> + <class-name>javaobject.MultiGetFunction</class-name> + </function> + <function> + <class-name>javaobject.MultiGetFunction2</class-name> + </function> + <function> + <class-name>javaobject.MultiPutFunction</class-name> + </function> + <function> + <class-name>javaobject.RegionOperationsFunction</class-name> + </function> + <function> + <class-name>javaobject.RegionOperationsHAFunction</class-name> + </function> + <function> + <class-name>javaobject.ExceptionHandlingFunction</class-name> + </function> + <function> + <class-name>javaobject.OnServerHAExceptionFunction</class-name> + </function> + <function> + <class-name>javaobject.OnServerHAShutdownFunction</class-name> + </function> + <function> + <class-name>javaobject.PdxFunctionTest</class-name> + </function> + <function> + <class-name>javaobject.SingleStrGetFunction</class-name> + </function> + <function> + <class-name>javaobject.executeFunction_SendException</class-name> + </function> + <function> + <class-name>javaobject.FEOnRegionPrSHOP</class-name> + </function> + <function> + <class-name>javaobject.FEOnRegionPrSHOP_OptimizeForWrite</class-name> + </function> + <function> + <class-name>javaobject.RegionOperationsHAFunctionPrSHOP</class-name> + </function> + </function-service> + <serialization-registration> + <instantiator id="5200"> + <class-name>javaobject.InstantiatorTest</class-name> + </instantiator> + </serialization-registration> +</cache> \ No newline at end of file diff --git a/clicache/integration-test/func_cacheserver2_pool.xml b/clicache/integration-test/func_cacheserver2_pool.xml index ec90576..354b1ff 100644 --- a/clicache/integration-test/func_cacheserver2_pool.xml +++ b/clicache/integration-test/func_cacheserver2_pool.xml @@ -1,5 +1,4 @@ <?xml version="1.0"?> - <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -16,79 +15,71 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - -<cache xmlns="http://geode.apache.org/schema/cache" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd" - version="1.0"> +<cache + xmlns="http://geode.apache.org/schema/cache" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd" version="1.0"> <cache-server port="HOST_PORT2"> - <group>ServerGroup1</group> + <group>ServerGroup1</group> </cache-server> - <pdx read-serialized="true" /> + <pdx read-serialized="true" /> <region name='partition_region'> - <region-attributes data-policy="partition" > - <partition-attributes redundant-copies="1" startup-recovery-delay="1"/> + <region-attributes data-policy="partition"> + <partition-attributes redundant-copies="1" startup-recovery-delay="1"/> </region-attributes> </region> - <function-service> - <function> - <class-name>javaobject.MultiGetFunctionI</class-name> - </function> - <function> - <class-name>javaobject.MultiPutFunctionI</class-name> - </function> - <function> - <class-name>javaobject.MultiGetFunction</class-name> - </function> - <function> - <class-name>javaobject.MultiGetFunction2</class-name> - </function> - <function> - <class-name>javaobject.MultiPutFunction</class-name> - </function> - <function> - <class-name>javaobject.RegionOperationsHAFunction</class-name> - </function> - <function> - <class-name>javaobject.RegionOperationsFunction</class-name> - </function> - <function> - <class-name>javaobject.ExceptionHandlingFunction</class-name> - </function> - <function> - <class-name>javaobject.OnServerHAExceptionFunction</class-name> - </function> - <function> - <class-name>javaobject.OnServerHAShutdownFunction</class-name> - </function> - - <function> - <class-name>javaobject.SingleStrGetFunction</class-name> - </function> - <function> - <class-name>javaobject.executeFunction_SendException</class-name> - </function> - <function> - <class-name>javaobject.RegionOperationsHAFunctionPrSHOP</class-name> - </function> - <function> - <class-name>javaobject.PdxFunctionTest</class-name> - </function> - <function> - <class-name>javaobject.FEOnRegionPrSHOP</class-name> - </function> - <function> - <class-name>javaobject.FEOnRegionPrSHOP_OptimizeForWrite</class-name> - </function> - <function> - <class-name>javaobject.FunctionExecutionTimeOut</class-name> - </function> - </function-service> - <serialization-registration> - <instantiator id="5200" > - <class-name>javaobject.InstantiatorTest</class-name> - </instantiator> - </serialization-registration> -</cache> + <function-service> + <function> + <class-name>javaobject.MultiGetFunctionI</class-name> + </function> + <function> + <class-name>javaobject.MultiPutFunctionI</class-name> + </function> + <function> + <class-name>javaobject.MultiGetFunction</class-name> + </function> + <function> + <class-name>javaobject.MultiGetFunction2</class-name> + </function> + <function> + <class-name>javaobject.MultiPutFunction</class-name> + </function> + <function> + <class-name>javaobject.RegionOperationsHAFunction</class-name> + </function> + <function> + <class-name>javaobject.RegionOperationsFunction</class-name> + </function> + <function> + <class-name>javaobject.ExceptionHandlingFunction</class-name> + </function> + <function> + <class-name>javaobject.OnServerHAExceptionFunction</class-name> + </function> + <function> + <class-name>javaobject.OnServerHAShutdownFunction</class-name> + </function> + <function> + <class-name>javaobject.SingleStrGetFunction</class-name> + </function> + <function> + <class-name>javaobject.executeFunction_SendException</class-name> + </function> + <function> + <class-name>javaobject.RegionOperationsHAFunctionPrSHOP</class-name> + </function> + <function> + <class-name>javaobject.PdxFunctionTest</class-name> + </function> + <function> + <class-name>javaobject.FEOnRegionPrSHOP</class-name> + </function> + <function> + <class-name>javaobject.FEOnRegionPrSHOP_OptimizeForWrite</class-name> + </function> + </function-service> + <serialization-registration> + <instantiator id="5200"> + <class-name>javaobject.InstantiatorTest</class-name> + </instantiator> + </serialization-registration> +</cache> \ No newline at end of file diff --git a/clicache/integration-test/func_cacheserver3_pool.xml b/clicache/integration-test/func_cacheserver3_pool.xml index 263dcc0..22a7e51 100644 --- a/clicache/integration-test/func_cacheserver3_pool.xml +++ b/clicache/integration-test/func_cacheserver3_pool.xml @@ -1,5 +1,4 @@ <?xml version="1.0"?> - <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -16,71 +15,64 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - -<cache xmlns="http://geode.apache.org/schema/cache" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd" - version="1.0"> +<cache + xmlns="http://geode.apache.org/schema/cache" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://geode.apache.org/schema/cache http://geode.apache.org/schema/cache/cache-1.0.xsd" version="1.0"> <cache-server port="HOST_PORT3"> - <group>ServerGroup1</group> + <group>ServerGroup1</group> </cache-server> <region name='partition_region'> - <region-attributes data-policy="partition" > - <partition-attributes redundant-copies="1" startup-recovery-delay="1"/> + <region-attributes data-policy="partition"> + <partition-attributes redundant-copies="1" startup-recovery-delay="1"/> </region-attributes> </region> - <function-service> - <function> - <class-name>javaobject.MultiGetFunctionI</class-name> - </function> - <function> - <class-name>javaobject.MultiPutFunctionI</class-name> - </function> - <function> - <class-name>javaobject.MultiGetFunction</class-name> - </function> - <function> - <class-name>javaobject.MultiPutFunction</class-name> - </function> - <function> - <class-name>javaobject.RegionOperationsHAFunction</class-name> - </function> - <function> - <class-name>javaobject.RegionOperationsFunction</class-name> - </function> - <function> - <class-name>javaobject.ExceptionHandlingFunction</class-name> - </function> - <function> - <class-name>javaobject.OnServerHAExceptionFunction</class-name> - </function> - <function> - <class-name>javaobject.OnServerHAShutdownFunction</class-name> - </function> - <function> - <class-name>javaobject.SingleStrGetFunction</class-name> - </function> - <function> - <class-name>javaobject.executeFunction_SendException</class-name> - </function> - <function> - <class-name>javaobject.FEOnRegionPrSHOP</class-name> - </function> - <function> - <class-name>javaobject.FEOnRegionPrSHOP_OptimizeForWrite</class-name> - </function> - <function> - <class-name>javaobject.RegionOperationsHAFunctionPrSHOP</class-name> - </function> - <function> - <class-name>javaobject.FunctionExecutionTimeOut</class-name> - </function> - </function-service> - <serialization-registration> - <instantiator id="5200" > - <class-name>javaobject.InstantiatorTest</class-name> - </instantiator> - </serialization-registration> -</cache> + <function-service> + <function> + <class-name>javaobject.MultiGetFunctionI</class-name> + </function> + <function> + <class-name>javaobject.MultiPutFunctionI</class-name> + </function> + <function> + <class-name>javaobject.MultiGetFunction</class-name> + </function> + <function> + <class-name>javaobject.MultiPutFunction</class-name> + </function> + <function> + <class-name>javaobject.RegionOperationsHAFunction</class-name> + </function> + <function> + <class-name>javaobject.RegionOperationsFunction</class-name> + </function> + <function> + <class-name>javaobject.ExceptionHandlingFunction</class-name> + </function> + <function> + <class-name>javaobject.OnServerHAExceptionFunction</class-name> + </function> + <function> + <class-name>javaobject.OnServerHAShutdownFunction</class-name> + </function> + <function> + <class-name>javaobject.SingleStrGetFunction</class-name> + </function> + <function> + <class-name>javaobject.executeFunction_SendException</class-name> + </function> + <function> + <class-name>javaobject.FEOnRegionPrSHOP</class-name> + </function> + <function> + <class-name>javaobject.FEOnRegionPrSHOP_OptimizeForWrite</class-name> + </function> + <function> + <class-name>javaobject.RegionOperationsHAFunctionPrSHOP</class-name> + </function> + </function-service> + <serialization-registration> + <instantiator id="5200"> + <class-name>javaobject.InstantiatorTest</class-name> + </instantiator> + </serialization-registration> +</cache> \ No newline at end of file -- To stop receiving notification emails like this one, please contact echobr...@apache.org.