[geode] branch develop updated: GEODE-8764: Lucene Functions should request data read permission only on the specified region (#5809)
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 9ccef08 GEODE-8764: Lucene Functions should request data read
permission only on the specified region (#5809)
9ccef08 is described below
commit 9ccef088ed5df32afaae1ceb7725be561544716d
Author: Xiaojian Zhou
AuthorDate: Thu Dec 3 22:41:01 2020 -0800
GEODE-8764: Lucene Functions should request data read permission only on
the specified region (#5809)
---
.../geode/cache/lucene/test/LuceneFunctionSecurityTest.java | 8 ++--
.../lucene/internal/distributed/IndexingInProgressFunction.java | 4 ++--
.../cache/lucene/internal/distributed/LuceneQueryFunction.java| 4 ++--
.../lucene/internal/distributed/WaitUntilFlushedFunction.java | 4 ++--
.../cache/lucene/internal/results/LuceneGetPageFunction.java | 4 ++--
5 files changed, 14 insertions(+), 10 deletions(-)
diff --git
a/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/test/LuceneFunctionSecurityTest.java
b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/test/LuceneFunctionSecurityTest.java
index a0448cf..39630de 100644
---
a/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/test/LuceneFunctionSecurityTest.java
+++
b/geode-lucene/src/integrationTest/java/org/apache/geode/cache/lucene/test/LuceneFunctionSecurityTest.java
@@ -86,8 +86,12 @@ public class LuceneFunctionSecurityTest {
for (Function function : functions) {
Collection permissions = function
.getRequiredPermissions(REGION_NAME);
- if (permissions.contains(ResourcePermissions.DATA_READ)) {
-functionsWithDataRead.add(function);
+ for (ResourcePermission permission : permissions) {
+if (permission.getResource().equals(ResourcePermission.Resource.DATA)
+&&
permission.getOperation().equals(ResourcePermission.Operation.READ)) {
+ functionsWithDataRead.add(function);
+ break;
+}
}
}
}
diff --git
a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/IndexingInProgressFunction.java
b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/IndexingInProgressFunction.java
index 33f1973..c1ba4abd 100644
---
a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/IndexingInProgressFunction.java
+++
b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/IndexingInProgressFunction.java
@@ -27,7 +27,6 @@ import org.apache.geode.cache.lucene.LuceneIndex;
import org.apache.geode.cache.lucene.LuceneService;
import org.apache.geode.cache.lucene.LuceneServiceProvider;
import org.apache.geode.internal.cache.execute.InternalFunction;
-import org.apache.geode.management.internal.security.ResourcePermissions;
import org.apache.geode.security.ResourcePermission;
public class IndexingInProgressFunction implements InternalFunction {
@@ -68,6 +67,7 @@ public class IndexingInProgressFunction implements
InternalFunction {
@Override
public Collection getRequiredPermissions(String
regionName) {
-return Collections.singletonList(ResourcePermissions.DATA_READ);
+return Collections.singletonList(new
ResourcePermission(ResourcePermission.Resource.DATA,
+ResourcePermission.Operation.READ, regionName));
}
}
diff --git
a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunction.java
b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunction.java
index 590034b..8fdf881 100644
---
a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunction.java
+++
b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/LuceneQueryFunction.java
@@ -53,7 +53,6 @@ import
org.apache.geode.internal.cache.execute.InternalFunctionInvocationTargetE
import
org.apache.geode.internal.cache.execute.PartitionedRegionFunctionResultSender;
import org.apache.geode.internal.serialization.KnownVersion;
import org.apache.geode.logging.internal.log4j.api.LogService;
-import org.apache.geode.management.internal.security.ResourcePermissions;
import org.apache.geode.security.ResourcePermission;
/**
@@ -235,6 +234,7 @@ public class LuceneQueryFunction implements
InternalFunction getRequiredPermissions(String
regionName) {
-return Collections.singletonList(ResourcePermissions.DATA_READ);
+return Collections.singletonList(new
ResourcePermission(ResourcePermission.Resource.DATA,
+ResourcePermission.Operation.READ, regionName));
}
}
diff --git
a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/distributed/WaitUntilFlushedFunction.java
[geode] branch develop updated (4e206f0 -> e26d759)
This is an automated email from the ASF dual-hosted git repository.
dschneider pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git.
from 4e206f0 GEODE-8730: don't bind to ephemeral ports in test
add e26d759 GEODE-8521: detect if a p2p reader thread is hung (#5763)
No new revisions were added by this update.
Summary of changes:
.../ThreadsMonitoringIntegrationTest.java | 145 ++---
.../internal/ClusterOperationExecutors.java| 3 +-
.../internal/LonerDistributionManager.java | 3 +-
.../internal/monitoring/ThreadsMonitoring.java | 36 -
.../internal/monitoring/ThreadsMonitoringImpl.java | 101 +-
.../monitoring/ThreadsMonitoringImplDummy.java | 15 +++
.../monitoring/ThreadsMonitoringProcess.java | 101 +++---
.../monitoring/executor/AbstractExecutor.java | 32 +++--
.../FunctionExecutionPooledExecutorGroup.java | 7 +-
.../executor/GatewaySenderEventProcessorGroup.java | 7 +-
.../executor/OneTaskOnlyExecutorGroup.java | 7 +-
...cutorGroup.java => P2PReaderExecutorGroup.java} | 29 +++--
.../monitoring/executor/PooledExecutorGroup.java | 13 +-
.../ScheduledThreadPoolExecutorWKAGroup.java | 7 +-
.../executor/SerialQueuedExecutorGroup.java| 7 +-
.../org/apache/geode/internal/tcp/Connection.java | 32 -
.../monitoring/ThreadsMonitoringImplJUnitTest.java | 80 ++--
.../monitoring/ThreadsMonitoringJUnitTest.java | 5 +-
.../ThreadsMonitoringProcessJUnitTest.java | 23 +---
.../executor/AbstractExecutorGroupJUnitTest.java | 4 +-
...ctionExecutionPooledExecutorGroupJUnitTest.java | 2 +-
.../GatewaySenderEventProcessorGroupJUnitTest.java | 2 +-
.../OneTaskOnlyExecutorGroupJUnitTest.java | 2 +-
.../executor/P2PReaderExecutorGroupTest.java | 53
.../executor/PooledExecutorGroupJUnitTest.java | 2 +-
...heduledThreadPoolExecutorWKAGroupJUnitTest.java | 2 +-
.../SerialQueuedExecutorGroupJUnitTest.java| 2 +-
.../apache/geode/internal/tcp/ConnectionTest.java | 7 +
28 files changed, 500 insertions(+), 229 deletions(-)
copy
geode-core/src/main/java/org/apache/geode/internal/monitoring/executor/{PooledExecutorGroup.java
=> P2PReaderExecutorGroup.java} (64%)
create mode 100644
geode-core/src/test/java/org/apache/geode/internal/monitoring/executor/P2PReaderExecutorGroupTest.java
[geode-native] branch develop updated: GEODE-8754: Fix uninitialized variable in DataInput::ReadInternalObject (#704)
This is an automated email from the ASF dual-hosted git repository.
mmartell pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/develop by this push:
new 03f6031 GEODE-8754: Fix uninitialized variable in
DataInput::ReadInternalObject (#704)
03f6031 is described below
commit 03f6031cbf9aa2dde46216cfebbaa8a4b46d4182
Author: Michael Martell
AuthorDate: Thu Dec 3 15:33:12 2020 -0800
GEODE-8754: Fix uninitialized variable in DataInput::ReadInternalObject
(#704)
* Initialize compId in DataInput::ReadInternalObject
* Add new test for ReadInternalObject: CompositeClassWithClassAsKey
* Add java classes to support new cli tests and update instantiators for
new classes
* Add ClassAsKey test
---
clicache/integration-test2/CMakeLists.txt | 1 +
clicache/integration-test2/PositionKey.cs | 100 +
clicache/integration-test2/SerializationTests.cs | 482 -
clicache/src/DataInput.cpp | 2 +-
tests/javaobject/cli/CompositeClass.java | 109 +
.../cli/InstantiateDataSerializable.java | 31 ++
tests/javaobject/cli/PositionKey.java | 77
tests/javaobject/cli/TestClassA.java | 93
tests/javaobject/cli/TestClassB.java | 93
tests/javaobject/cli/TestClassC.java | 94
10 files changed, 1078 insertions(+), 4 deletions(-)
diff --git a/clicache/integration-test2/CMakeLists.txt
b/clicache/integration-test2/CMakeLists.txt
index f355472..725ebde 100644
--- a/clicache/integration-test2/CMakeLists.txt
+++ b/clicache/integration-test2/CMakeLists.txt
@@ -42,6 +42,7 @@ add_library( ${PROJECT_NAME} SHARED
RegionTest.cs
RegionSSLTest.cs
Position.cs
+ PositionKey.cs
TestBase.cs
cache.xml
geode.properties
diff --git a/clicache/integration-test2/PositionKey.cs
b/clicache/integration-test2/PositionKey.cs
new file mode 100644
index 000..02c6163
--- /dev/null
+++ b/clicache/integration-test2/PositionKey.cs
@@ -0,0 +1,100 @@
+/*
+ * 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.
+ */
+
+using System;
+
+namespace Apache.Geode.Client.IntegrationTests
+{
+ using Apache.Geode.Client;
+ public class PositionKey : ICacheableKey, IDataSerializable
+ {
+private long m_positionId;
+
+ public PositionKey() { }
+ public PositionKey(long positionId)
+ {
+ m_positionId = positionId;
+ }
+ public long PositionId
+ {
+ get
+ {
+ return m_positionId;
+ }
+ set
+ {
+ m_positionId = value;
+ }
+ }
+
+ public void FromData(DataInput input)
+ {
+ m_positionId = input.ReadInt64();
+ }
+
+ public void ToData(DataOutput output)
+{
+ output.WriteInt64(m_positionId);
+}
+
+public UInt64 ObjectSize
+{
+ get
+ {
+ return 8;
+ }
+}
+
+ public static IDataSerializable CreateDeserializable()
+ {
+ return new PositionKey();
+ }
+
+ public static int GetClassID()
+ {
+ return 77;
+ }
+
+ public bool Equals(ICacheableKey other)
+ {
+ return Equals((Object)other);
+ }
+
+ public override bool Equals(object obj)
+ {
+ if (this == obj)
+ {
+ return true;
+ }
+
+ if (GetType() != obj.GetType())
+ {
+ return false;
+ }
+
+ PositionKey otherKey = (PositionKey)obj;
+ return (m_positionId == otherKey.m_positionId);
+ }
+
+ public override int GetHashCode()
+ {
+ int hash = 11;
+ hash = 31 * hash + (int)m_positionId;
+ return hash;
+ }
+ }
+}
diff --git a/clicache/integration-test2/SerializationTests.cs
b/clicache/integration-test2/SerializationTests.cs
index 47dd405..bce822d 100644
---
[geode] branch develop updated: GEODE-8730: don't bind to ephemeral ports in test
This is an automated email from the ASF dual-hosted git repository. burcham pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git The following commit(s) were added to refs/heads/develop by this push: new 4e206f0 GEODE-8730: don't bind to ephemeral ports in test 4e206f0 is described below commit 4e206f09df87d26fd22a3238596ac4bc12cf4846 Author: Bill Burcham AuthorDate: Thu Dec 3 12:27:14 2020 -0800 GEODE-8730: don't bind to ephemeral ports in test --- .../resources/org/apache/geode/client/sni/docker-compose.yml | 3 ++- .../acceptanceTest/resources/org/apache/geode/client/sni/haproxy.cfg | 4 ++-- .../org/apache/geode/client/sni/scripts/geode-starter-2.gfsh | 4 ++-- .../resources/org/apache/geode/client/sni/scripts/geode-starter.gfsh | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/docker-compose.yml b/geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/docker-compose.yml index dd52102..730d74d 100644 --- a/geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/docker-compose.yml +++ b/geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/docker-compose.yml @@ -22,7 +22,8 @@ services: hostname: geode expose: - '10334' - - '40404' + - '8501' + - '8502' entrypoint: 'sh' command: '-c /geode/scripts/forever' networks: diff --git a/geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/haproxy.cfg b/geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/haproxy.cfg index c451ef6..b77a1d5 100644 --- a/geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/haproxy.cfg +++ b/geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/haproxy.cfg @@ -37,8 +37,8 @@ backend locators-maeve backend servers-dolores mode tcp - server server1 geode:40404 + server server1 geode:8501 backend servers-clementine mode tcp - server server1 geode:40405 + server server1 geode:8502 diff --git a/geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/scripts/geode-starter-2.gfsh b/geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/scripts/geode-starter-2.gfsh index d640a77..5e6ad74 100644 --- a/geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/scripts/geode-starter-2.gfsh +++ b/geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/scripts/geode-starter-2.gfsh @@ -16,8 +16,8 @@ # start locator --name=locator-maeve --connect=false --redirect-output --hostname-for-clients=locator-maeve --properties-file=/geode/config/gemfire.properties --security-properties-file=/geode/config/gfsecurity.properties --J=-Dgemfire.ssl-keystore=/geode/config/locator-maeve-keystore.jks -start server --name=server-dolores --group=group-dolores --hostname-for-clients=server-dolores --locators=geode[10334] --properties-file=/geode/config/gemfire.properties --security-properties-file=/geode/config/gfsecurity.properties --J=-Dgemfire.ssl-keystore=/geode/config/server-dolores-keystore.jks -start server --name=server-clementine --group=group-clementine --hostname-for-clients=server-clementine --server-port=40405 --locators=geode[10334] --properties-file=/geode/config/gemfire.properties --security-properties-file=/geode/config/gfsecurity.properties --J=-Dgemfire.ssl-keystore=/geode/config/server-clementine-keystore.jks +start server --name=server-dolores --group=group-dolores --hostname-for-clients=server-dolores --server-port=8501 --locators=geode[10334] --properties-file=/geode/config/gemfire.properties --security-properties-file=/geode/config/gfsecurity.properties --J=-Dgemfire.ssl-keystore=/geode/config/server-dolores-keystore.jks +start server --name=server-clementine --group=group-clementine --hostname-for-clients=server-clementine --server-port=8502 --locators=geode[10334] --properties-file=/geode/config/gemfire.properties --security-properties-file=/geode/config/gfsecurity.properties --J=-Dgemfire.ssl-keystore=/geode/config/server-clementine-keystore.jks connect --locator=geode[10334] --use-ssl=true --security-properties-file=/geode/config/gfsecurity.properties create region --name=region-dolores --group=group-dolores --type=REPLICATE create region --name=region-clementine --group=group-clementine --type=REPLICATE diff --git a/geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/scripts/geode-starter.gfsh b/geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/scripts/geode-starter.gfsh index bd89a37..a9a9685 100644 --- a/geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/scripts/geode-starter.gfsh +++ b/geode-assembly/src/acceptanceTest/resources/org/apache/geode/client/sni/scripts/geode-starter.gfsh @@ -16,7 +16,7 @@ #
[geode] branch develop updated (e1ff2ef -> f6ee107)
This is an automated email from the ASF dual-hosted git repository. jensdeppe pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from e1ff2ef GEODE-8755: Write bundled jars file correct dir (#5800) add f6ee107 GEODE-8759: Update docs to include HSTRLEN and INFO as unsupported (#5810) No new revisions were added by this update. Summary of changes: .../tools_modules/redis_api_for_geode.html.md.erb | 14 +++-- geode-redis/README.md | 68 +++--- .../geode/redis/internal/RedisCommandType.java | 10 ++-- 3 files changed, 46 insertions(+), 46 deletions(-)
[geode] branch support/1.13 updated: GEODE-8736: change docs product_version to 3 digits
This is an automated email from the ASF dual-hosted git repository. onichols pushed a commit to branch support/1.13 in repository https://gitbox.apache.org/repos/asf/geode.git The following commit(s) were added to refs/heads/support/1.13 by this push: new 192d709 GEODE-8736: change docs product_version to 3 digits 192d709 is described below commit 192d7096fb77d477530cdd9f2e45259011804a08 Author: Owen Nichols AuthorDate: Thu Dec 3 10:54:08 2020 -0800 GEODE-8736: change docs product_version to 3 digits --- geode-book/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geode-book/config.yml b/geode-book/config.yml index a11e805..338d164 100644 --- a/geode-book/config.yml +++ b/geode-book/config.yml @@ -27,7 +27,7 @@ sections: template_variables: product_name_long: Apache Geode product_name: Geode - product_version: '1.13' + product_version: '1.13.2' product_version_nodot: '113' product_version_geode: '1.13' min_java_version: '8'
[geode] branch develop updated (3fdc0c3 -> e1ff2ef)
This is an automated email from the ASF dual-hosted git repository. dhemery pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 3fdc0c3 GEODE-8532: Corrected the geode-tcp-server jar name in doc (#5808) add e1ff2ef GEODE-8755: Write bundled jars file correct dir (#5800) No new revisions were added by this update. Summary of changes: .../java/org/apache/geode/AssemblyContentsIntegrationTest.java | 2 +- .../src/integrationTest/java/org/apache/geode/BundledJarsJUnitTest.java | 2 +- .../java/org/apache/geode/GeodeDependencyJarIntegrationTest.java| 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
[geode] branch develop updated (2e7e456 -> 3fdc0c3)
This is an automated email from the ASF dual-hosted git repository. nnag pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 2e7e456 GEODE-8687: Fix for handling of PdxSerializationException on client (#5730) add 3fdc0c3 GEODE-8532: Corrected the geode-tcp-server jar name in doc (#5808) No new revisions were added by this update. Summary of changes: .../http_session_mgmt/tomcat_installing_the_module.html.md.erb | 2 +- .../http_session_mgmt/weblogic_setting_up_the_module.html.md.erb| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
