From 96ed9b5379059da6e4fa6d2cd6de780c135b7d3b Mon Sep 17 00:00:00 2001 From: lvca Date: Wed, 24 Nov 2021 11:37:52 -0500 Subject: [PATCH 1/4] Re-enabled replication tests after the latest fixes --- pom.xml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/pom.xml b/pom.xml index 5b1f52b878..38d3e27dcd 100644 --- a/pom.xml +++ b/pom.xml @@ -177,21 +177,7 @@ **/*HASplitBrainIT.java - **/*ReplicationServerLeaderDownNoTransactionsToForwardIT.java - **/*ReplicationServerLeaderChanges3TimesIT.java - **/*ReplicationServerLeaderDownIT.java - **/*ReplicationServerQuorumMajority2ServersOutIT.java - **/*ReplicationServerQuorumAllIT.java - **/*ReplicationServerQuorumMajorityIT.java - **/*ReplicationServerQuorumNoneIT.java - **/*ReplicationServerReplicaHotResyncIT.java - **/*ReplicationServerReplicaRestartForceDbInstallIT.java - **/*ReplicationServerWriteAgainstReplicaIT.java - **/*ServerBackupDatabaseIT.java **/*HTTP2ServersIT.java - **/*TwoServersIT.java - **/*FullBackupIT.java - **/*RemoteConsoleIT.java **/ArcadeGraphProcessDebugTest.java **/ArcadeGraphStructureDebugTest.java ${exclude.tests} From 96419825005055c4836981ab97da06014e08f7a6 Mon Sep 17 00:00:00 2001 From: lvca Date: Wed, 24 Nov 2021 12:12:01 -0500 Subject: [PATCH 2/4] Reduced RAM used by backup/restore test --- .../arcadedb/integration/backup/FullBackupIT.java | 15 ++++++++++----- .../integration/importer/OrientDBImporterIT.java | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/integration/src/test/java/com/arcadedb/integration/backup/FullBackupIT.java b/integration/src/test/java/com/arcadedb/integration/backup/FullBackupIT.java index 93d2696aa6..7a230791bc 100644 --- a/integration/src/test/java/com/arcadedb/integration/backup/FullBackupIT.java +++ b/integration/src/test/java/com/arcadedb/integration/backup/FullBackupIT.java @@ -126,12 +126,17 @@ public int getBucketIdByRecord(Document record, boolean async) { public void run() { final AtomicInteger totalPerThread = new AtomicInteger(); for (int j = 0; j < 500; j++) { - importedDatabase.transaction(() -> { - for (int k = 0; k < 500; k++) { - MutableVertex v = importedDatabase.newVertex("BackupTest").set("thread", threadId).set("id", totalPerThread.getAndIncrement()).save(); - Assertions.assertEquals(threadBucket.getId(), v.getIdentity().getBucketId()); + importedDatabase.begin(); + for (int k = 0; k < 500; k++) { + MutableVertex v = importedDatabase.newVertex("BackupTest").set("thread", threadId).set("id", totalPerThread.getAndIncrement()).save(); + Assertions.assertEquals(threadBucket.getId(), v.getIdentity().getBucketId()); + + if (k + 1 % 100 == 0) { + importedDatabase.commit(); + importedDatabase.begin(); } - }); + } + importedDatabase.commit(); } } diff --git a/integration/src/test/java/com/arcadedb/integration/importer/OrientDBImporterIT.java b/integration/src/test/java/com/arcadedb/integration/importer/OrientDBImporterIT.java index 5181077ad4..598b2b433d 100644 --- a/integration/src/test/java/com/arcadedb/integration/importer/OrientDBImporterIT.java +++ b/integration/src/test/java/com/arcadedb/integration/importer/OrientDBImporterIT.java @@ -65,8 +65,8 @@ public void testImportOK() throws IOException { Assertions.assertEquals("admin", security.getString("name")); } } - Assertions.assertTrue(DatabaseFactory.getActiveDatabaseInstances().isEmpty(), "Found active databases: " + DatabaseFactory.getActiveDatabaseInstances()); } finally { + Assertions.assertTrue(DatabaseFactory.getActiveDatabaseInstances().isEmpty(), "Found active databases: " + DatabaseFactory.getActiveDatabaseInstances()); FileUtils.deleteRecursively(databaseDirectory); } } From b9d1a728e869f242f0588eaf75bf474fba7e686c Mon Sep 17 00:00:00 2001 From: lvca Date: Wed, 24 Nov 2021 12:23:37 -0500 Subject: [PATCH 3/4] Fixed backup test case --- .../java/com/arcadedb/integration/backup/FullBackupIT.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/integration/src/test/java/com/arcadedb/integration/backup/FullBackupIT.java b/integration/src/test/java/com/arcadedb/integration/backup/FullBackupIT.java index 7a230791bc..3749d48d3e 100644 --- a/integration/src/test/java/com/arcadedb/integration/backup/FullBackupIT.java +++ b/integration/src/test/java/com/arcadedb/integration/backup/FullBackupIT.java @@ -101,8 +101,9 @@ public void testFullBackupConcurrency() throws IOException, InterruptedException } final Thread[] threads = new Thread[CONCURRENT_THREADS]; + + final Database importedDatabase = importDatabase(); try { - final Database importedDatabase = importDatabase(); final VertexType type = importedDatabase.getSchema().createVertexType("BackupTest", CONCURRENT_THREADS); @@ -177,6 +178,8 @@ public void run() { Assertions.assertTrue(DatabaseFactory.getActiveDatabaseInstances().isEmpty(), "Found active databases: " + DatabaseFactory.getActiveDatabaseInstances()); } finally { + importedDatabase.close(); + for (int i = 0; i < CONCURRENT_THREADS; i++) { new File(FILE + "_" + i).delete(); FileUtils.deleteRecursively(new File(DATABASE_PATH + "_restored_" + i)); From e39de895185b844549eb0ae480260173b06e5038 Mon Sep 17 00:00:00 2001 From: lvca Date: Wed, 24 Nov 2021 12:24:37 -0500 Subject: [PATCH 4/4] Fixed test --- .../java/com/arcadedb/integration/backup/FullBackupIT.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/integration/src/test/java/com/arcadedb/integration/backup/FullBackupIT.java b/integration/src/test/java/com/arcadedb/integration/backup/FullBackupIT.java index 3749d48d3e..29c800d20c 100644 --- a/integration/src/test/java/com/arcadedb/integration/backup/FullBackupIT.java +++ b/integration/src/test/java/com/arcadedb/integration/backup/FullBackupIT.java @@ -176,10 +176,11 @@ public void run() { } } - Assertions.assertTrue(DatabaseFactory.getActiveDatabaseInstances().isEmpty(), "Found active databases: " + DatabaseFactory.getActiveDatabaseInstances()); } finally { importedDatabase.close(); + Assertions.assertTrue(DatabaseFactory.getActiveDatabaseInstances().isEmpty(), "Found active databases: " + DatabaseFactory.getActiveDatabaseInstances()); + for (int i = 0; i < CONCURRENT_THREADS; i++) { new File(FILE + "_" + i).delete(); FileUtils.deleteRecursively(new File(DATABASE_PATH + "_restored_" + i));