This is an automated email from the ASF dual-hosted git repository.
zstan pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new 27be717590 IGNITE-17585 fix flaky
ItCommonApiTest.testSessionExpiration test - Fixes #1041.
27be717590 is described below
commit 27be717590e7e7fc4822910d8a5599946d4d4d95
Author: Yury Gerzhedovich <[email protected]>
AuthorDate: Fri Sep 2 07:51:30 2022 +0300
IGNITE-17585 fix flaky ItCommonApiTest.testSessionExpiration test - Fixes
#1041.
Signed-off-by: zstan <[email protected]>
---
.../org/apache/ignite/tx/TransactionException.java | 13 +++++
.../client/fakes/FakeIgniteQueryProcessor.java | 7 +++
.../ignite/internal/sql/api/ItCommonApiTest.java | 12 ++--
.../ignite/internal/sql/engine/QueryProcessor.java | 10 ++++
.../internal/sql/engine/SqlQueryProcessor.java | 7 +++
.../internal/sql/engine/session/SessionInfo.java | 64 ++++++++++++++++++++++
.../sql/engine/session/SessionManager.java | 13 ++++-
7 files changed, 120 insertions(+), 6 deletions(-)
diff --git
a/modules/api/src/main/java/org/apache/ignite/tx/TransactionException.java
b/modules/api/src/main/java/org/apache/ignite/tx/TransactionException.java
index 7b60d6d5f2..85afee8bdd 100644
--- a/modules/api/src/main/java/org/apache/ignite/tx/TransactionException.java
+++ b/modules/api/src/main/java/org/apache/ignite/tx/TransactionException.java
@@ -17,6 +17,7 @@
package org.apache.ignite.tx;
+import java.util.UUID;
import org.apache.ignite.lang.IgniteException;
/** This exception is thrown if a transaction can't be finished by some
reasons. */
@@ -38,4 +39,16 @@ public class TransactionException extends IgniteException {
public TransactionException(Throwable cause) {
super(cause);
}
+
+ /**
+ * Creates a new transaction exception with the given trace id, error
code, detail message and cause.
+ *
+ * @param traceId Unique identifier of this exception.
+ * @param code Full error code.
+ * @param message Detail message.
+ * @param cause Optional nested exception (can be {@code null}).
+ */
+ public TransactionException(UUID traceId, int code, String message,
Throwable cause) {
+ super(traceId, code, message, cause);
+ }
}
diff --git
a/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeIgniteQueryProcessor.java
b/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeIgniteQueryProcessor.java
index fbac649e26..695ccf8393 100644
---
a/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeIgniteQueryProcessor.java
+++
b/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeIgniteQueryProcessor.java
@@ -17,6 +17,7 @@
package org.apache.ignite.client.fakes;
+import java.util.Collections;
import java.util.List;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
@@ -25,6 +26,7 @@ import org.apache.ignite.internal.sql.engine.QueryContext;
import org.apache.ignite.internal.sql.engine.QueryProcessor;
import org.apache.ignite.internal.sql.engine.property.PropertiesHolder;
import org.apache.ignite.internal.sql.engine.session.SessionId;
+import org.apache.ignite.internal.sql.engine.session.SessionInfo;
/**
* Fake {@link QueryProcessor}.
@@ -40,6 +42,11 @@ public class FakeIgniteQueryProcessor implements
QueryProcessor {
return CompletableFuture.completedFuture(null);
}
+ @Override
+ public List<SessionInfo> liveSessions() {
+ return Collections.emptyList();
+ }
+
@Override
public List<CompletableFuture<AsyncSqlCursor<List<Object>>>>
queryAsync(String schemaName, String qry, Object... params) {
return List.of(CompletableFuture.completedFuture(new FakeCursor()));
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItCommonApiTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItCommonApiTest.java
index 33fade1473..c787ed7384 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItCommonApiTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItCommonApiTest.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.sql.api;
+import static
org.apache.ignite.internal.testframework.IgniteTestUtils.waitForCondition;
import static org.apache.ignite.lang.ErrorGroups.Sql;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -55,21 +56,22 @@ public class ItCommonApiTest extends
AbstractBasicIntegrationTest {
/** Check correctness of session expiration. */
@Test
public void testSessionExpiration() throws Exception {
- long timeout = TimeUnit.SECONDS.toMillis(2); // time from
SessionManager.checkPeriod * 2
-
IgniteSql sql = igniteSql();
sql("CREATE TABLE TST(id INTEGER PRIMARY KEY, val INTEGER)");
sql("INSERT INTO TST VALUES (1,1), (2,2), (3,3), (4,4)");
- Session ses1 = sql.sessionBuilder().defaultPageSize(1).idleTimeout(1,
TimeUnit.MILLISECONDS).build();
+ Session ses1 = sql.sessionBuilder().defaultPageSize(1).idleTimeout(2,
TimeUnit.SECONDS).build();
Session ses2 =
sql.sessionBuilder().defaultPageSize(1).idleTimeout(100,
TimeUnit.SECONDS).build();
+ assertEquals(2, queryProcessor().liveSessions().size());
+
ResultSet rs1 = ses1.execute(null, "SELECT id FROM TST");
ResultSet rs2 = ses2.execute(null, "SELECT id FROM TST");
- // waiting for run session cleanup thread
- Thread.sleep(timeout);
+ waitForCondition(() -> {
+ return queryProcessor().liveSessions().size() == 1;
+ }, 10_000);
// first session should be expired for the moment
SqlException ex = assertThrows(SqlException.class, () ->
ses1.execute(null, "SELECT 1 + 1"));
diff --git
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/QueryProcessor.java
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/QueryProcessor.java
index e5fb1950fd..349968b134 100644
---
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/QueryProcessor.java
+++
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/QueryProcessor.java
@@ -22,6 +22,7 @@ import java.util.concurrent.CompletableFuture;
import org.apache.ignite.internal.manager.IgniteComponent;
import org.apache.ignite.internal.sql.engine.property.PropertiesHolder;
import org.apache.ignite.internal.sql.engine.session.SessionId;
+import org.apache.ignite.internal.sql.engine.session.SessionInfo;
import org.apache.ignite.lang.IgniteException;
/**
@@ -47,6 +48,15 @@ public interface QueryProcessor extends IgniteComponent {
*/
CompletableFuture<Void> closeSession(SessionId sessionId);
+ /**
+ * Provide list of live sessions.
+ *
+ * <p>This method return the information is actual only on method
invocation time.
+ *
+ * @return List of active sessions.
+ */
+ List<SessionInfo> liveSessions();
+
/**
* Execute the query with given schema name and parameters.
*
diff --git
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/SqlQueryProcessor.java
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/SqlQueryProcessor.java
index c65b1e56fa..562bc7df4c 100644
---
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/SqlQueryProcessor.java
+++
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/SqlQueryProcessor.java
@@ -64,6 +64,7 @@ import
org.apache.ignite.internal.sql.engine.property.PropertiesHolder;
import org.apache.ignite.internal.sql.engine.schema.SqlSchemaManager;
import org.apache.ignite.internal.sql.engine.schema.SqlSchemaManagerImpl;
import org.apache.ignite.internal.sql.engine.session.SessionId;
+import org.apache.ignite.internal.sql.engine.session.SessionInfo;
import org.apache.ignite.internal.sql.engine.session.SessionManager;
import org.apache.ignite.internal.sql.engine.util.BaseQueryContext;
import org.apache.ignite.internal.sql.engine.util.Commons;
@@ -239,6 +240,12 @@ public class SqlQueryProcessor implements QueryProcessor {
return session.closeAsync();
}
+ /** {@inheritDoc} */
+ @Override
+ public List<SessionInfo> liveSessions() {
+ return sessionManager.liveSessions();
+ }
+
/** {@inheritDoc} */
@Override
public synchronized void stop() throws Exception {
diff --git
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/session/SessionInfo.java
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/session/SessionInfo.java
new file mode 100644
index 0000000000..af5c6bffea
--- /dev/null
+++
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/session/SessionInfo.java
@@ -0,0 +1,64 @@
+/*
+ * 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.
+ */
+
+package org.apache.ignite.internal.sql.engine.session;
+
+import org.apache.ignite.internal.sql.engine.property.PropertiesHolder;
+
+/**
+ * Session descriptor.
+ */
+public class SessionInfo {
+
+ /** A session identifier. */
+ private final SessionId sessionId;
+
+ /** The properties this session associated with. */
+ private final PropertiesHolder queryProperties;
+
+ /**
+ * Duration in milliseconds after which the session will be considered
expired if no action have been performed on behalf of this
+ * session during this period.
+ */
+ private final long idleTimeoutMs;
+
+ /**
+ * Constructor.
+ *
+ * @param session Session object,
+ */
+ public SessionInfo(Session session) {
+ this.sessionId = session.sessionId();
+ this.queryProperties = session.queryProperties();
+ this.idleTimeoutMs = getIdleTimeoutMs();
+ }
+
+ /** Returns the identifier of this session. */
+ public SessionId getSessionId() {
+ return sessionId;
+ }
+
+ /** Returns the properties this session associated with. */
+ public PropertiesHolder getQueryProperties() {
+ return queryProperties;
+ }
+
+ /** Returns the duration in millis after which the session will be
considered expired if no one touched it in the middle. */
+ public long getIdleTimeoutMs() {
+ return idleTimeoutMs;
+ }
+}
diff --git
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/session/SessionManager.java
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/session/SessionManager.java
index 6df7a9e1c9..e7f3311d56 100644
---
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/session/SessionManager.java
+++
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/session/SessionManager.java
@@ -17,10 +17,12 @@
package org.apache.ignite.internal.sql.engine.session;
+import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Collectors;
import org.apache.ignite.internal.logger.IgniteLogger;
import org.apache.ignite.internal.logger.Loggers;
import org.apache.ignite.internal.sql.engine.CurrentTimeProvider;
@@ -121,14 +123,23 @@ public class SessionManager implements LifecycleAware {
return session;
}
+ /**
+ * Provide list af live session.
+ *
+ * @return List of active sessions
+ */
+ public List<SessionInfo> liveSessions() {
+ return activeSessions.values().stream().filter((s) ->
!s.expired()).map(SessionInfo::new).collect(Collectors.toList());
+ }
+
/**
* Destroy a given session.
*
* @param session Session which should be destroyed
*/
private void destroySession(Session session) {
- activeSessions.remove(session.sessionId());
session.closeAsync();
+ activeSessions.remove(session.sessionId());
}
private SessionId nextSessionId() {
