Skip to content

Commit a613537

Browse files
committed
removed active-failover tests
1 parent c7099a6 commit a613537

File tree

12 files changed

+7
-47
lines changed

12 files changed

+7
-47
lines changed

.circleci/config.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -590,21 +590,6 @@ workflows:
590590
branches:
591591
only:
592592
- main
593-
- test:
594-
name: test-activefailover-<<matrix.docker-img>>
595-
matrix:
596-
parameters:
597-
docker-img:
598-
- 'docker.io/arangodb/arangodb:3.11'
599-
- 'docker.io/arangodb/enterprise:3.11'
600-
topology:
601-
- 'activefailover'
602-
filters:
603-
tags:
604-
only: /^v.*/
605-
branches:
606-
only:
607-
- main
608593

609594
test-non-func:
610595
when:

core/src/main/java/com/arangodb/ArangoDB.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -579,12 +579,10 @@ public Builder keepAliveInterval(final Integer keepAliveInterval) {
579579
}
580580

581581
/**
582-
* Whether the driver should acquire a list of available coordinators in an ArangoDB cluster or a single
583-
* server with active failover. In case of Active-Failover deployment set to {@code true} to enable automatic
584-
* master discovery.
582+
* Whether the driver should acquire a list of available coordinators in an ArangoDB cluster.
585583
*
586584
* <p>
587-
* The host list will be used for failover and load balancing.
585+
* The host list will be used for load balancing.
588586
* </p>
589587
*
590588
* @param acquireHostList whether automatically acquire a list of available hosts (default: false)
@@ -607,8 +605,7 @@ public Builder acquireHostListInterval(final Integer acquireHostListInterval) {
607605
}
608606

609607
/**
610-
* Sets the load balancing strategy to be used in an ArangoDB cluster setup. In case of Active-Failover
611-
* deployment set to {@link LoadBalancingStrategy#NONE} or not set at all, since that would be the default.
608+
* Sets the load balancing strategy to be used in an ArangoDB cluster setup.
612609
*
613610
* @param loadBalancingStrategy the load balancing strategy to be used (default:
614611
* {@link LoadBalancingStrategy#NONE}

core/src/main/java/com/arangodb/model/AqlQueryOptions.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,8 @@ public Boolean getAllowDirtyRead() {
6161
* ({@link AqlQueryOptions#streamTransactionId(String)}). The header set when creating the transaction decides
6262
* about dirty reads for the entire transaction, not the individual read operations.
6363
*
64-
* @param allowDirtyRead Set to {@code true} allows reading from followers in an active-failover setup.
64+
* @param allowDirtyRead Set to {@code true} allows reading from followers.
6565
* @return this
66-
* @see <a href="https://docs.arangodb.com/3.11/deploy/active-failover/administration/#reading-from-follower">API
67-
* Documentation</a>
6866
*/
6967
public AqlQueryOptions allowDirtyRead(final Boolean allowDirtyRead) {
7068
this.allowDirtyRead = allowDirtyRead;

core/src/main/java/com/arangodb/model/DocumentReadOptions.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ public DocumentReadOptions ifMatch(final String ifMatch) {
6464
/**
6565
* @param allowDirtyRead Set to {@code true} allows reading from followers in an active-failover setup.
6666
* @return options
67-
* @see <a href="https://docs.arangodb.com/stable/deploy/active-failover/administration/#reading-from-follower">API
68-
* Documentation</a>
6967
* @since ArangoDB 3.4.0
7068
*/
7169
public DocumentReadOptions allowDirtyRead(final Boolean allowDirtyRead) {

core/src/main/java/com/arangodb/model/GraphDocumentReadOptions.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ public GraphDocumentReadOptions ifMatch(final String ifMatch) {
6363
/**
6464
* @param allowDirtyRead Set to {@code true} allows reading from followers in an active-failover setup.
6565
* @return options
66-
* @see <a href="https://docs.arangodb.com/stable/deploy/active-failover/administration/#reading-from-follower">API
67-
* Documentation</a>
6866
* @since ArangoDB 3.4.0
6967
*/
7068
public GraphDocumentReadOptions allowDirtyRead(final Boolean allowDirtyRead) {

core/src/main/java/com/arangodb/model/StreamTransactionOptions.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,6 @@ public Boolean getAllowDirtyRead() {
140140
/**
141141
* @param allowDirtyRead Set to {@code true} allows reading from followers in an active-failover setup.
142142
* @return options
143-
* @see <a href="https://docs.arangodb.com/stable/deploy/active-failover/administration/#reading-from-follower">API
144-
* Documentation</a>
145143
* @since ArangoDB 3.4.0
146144
*/
147145
public StreamTransactionOptions allowDirtyRead(final Boolean allowDirtyRead) {

docker/start_db.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
# Configuration environment variables:
4-
# STARTER_MODE: (single|cluster|activefailover), default single
4+
# STARTER_MODE: (single|cluster), default single
55
# DOCKER_IMAGE: ArangoDB docker image, default docker.io/arangodb/arangodb:latest
66
# STARTER_DOCKER_IMAGE: ArangoDB Starter docker image, default docker.io/arangodb/arangodb-starter:latest
77
# SSL: (true|false), default false
@@ -111,9 +111,3 @@ for a in ${COORDINATORS[*]} ; do
111111
echo "$SCHEME://$a"
112112
echo ""
113113
done
114-
115-
if [ "$STARTER_MODE" == "activefailover" ]; then
116-
LEADER=$("$LOCATION"/find_active_endpoint.sh)
117-
echo "Leader: $SCHEME://$LEADER"
118-
echo ""
119-
fi

test-functional/src/test/java/com/arangodb/ArangoCollectionAsyncTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -723,7 +723,7 @@ void getDocumentsWithCustomShardingKey(ArangoCollectionAsync c) throws Execution
723723
@ParameterizedTest
724724
@MethodSource("asyncCols")
725725
void getDocumentsDirtyRead(ArangoCollectionAsync collection) throws ExecutionException, InterruptedException {
726-
assumeTrue(isCluster()); // skip activefailover
726+
assumeTrue(isCluster());
727727
final Collection<BaseDocument> values = new ArrayList<>();
728728
values.add(new BaseDocument("1"));
729729
values.add(new BaseDocument("2"));

test-functional/src/test/java/com/arangodb/ArangoCollectionTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -773,7 +773,7 @@ void getDocumentsWithCustomShardingKey(ArangoCollection c) {
773773
@ParameterizedTest
774774
@MethodSource("cols")
775775
void getDocumentsDirtyRead(ArangoCollection collection) {
776-
assumeTrue(isCluster()); // skip activefailover
776+
assumeTrue(isCluster());
777777
final Collection<BaseDocument> values = new ArrayList<>();
778778
values.add(new BaseDocument("1"));
779779
values.add(new BaseDocument("2"));

test-functional/src/test/java/com/arangodb/ArangoDBAsyncTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,6 @@ void createDatabaseWithUsers(ArangoDBAsync arangoDB) throws InterruptedException
188188
assertThat(retrievedUser.getActive()).isTrue();
189189
assertThat(retrievedUser.getExtra()).isEqualTo(extra);
190190

191-
// needed for active-failover tests only
192-
Thread.sleep(2_000);
193-
194191
ArangoDBAsync arangoDBTestUser = new ArangoDB.Builder()
195192
.loadProperties(config)
196193
.user("testUser")

test-functional/src/test/java/com/arangodb/ArangoDBTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,9 +192,6 @@ void createDatabaseWithUsers(ArangoDB arangoDB) throws InterruptedException {
192192
assertThat(retrievedUser.getActive()).isTrue();
193193
assertThat(retrievedUser.getExtra()).isEqualTo(extra);
194194

195-
// needed for active-failover tests only
196-
Thread.sleep(2_000);
197-
198195
ArangoDB arangoDBTestUser = new ArangoDB.Builder()
199196
.loadProperties(config)
200197
.user("testUser")

test-functional/src/test/java/com/arangodb/internal/velocystream/CommunicationTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ void multiThread() throws Exception {
5656
final ArangoDB arangoDB = new ArangoDB.Builder()
5757
.loadProperties(ConfigUtils.loadConfig())
5858
.build();
59-
arangoDB.getUsers(); // authentication and active-failover connection redirect to master
6059

6160
final Collection<String> result = new ConcurrentLinkedQueue<>();
6261
final Thread fast = new Thread(() -> {
@@ -85,7 +84,6 @@ void multiThreadSameDatabases() throws Exception {
8584
final ArangoDB arangoDB = new ArangoDB.Builder()
8685
.loadProperties(ConfigUtils.loadConfig())
8786
.build();
88-
arangoDB.getUsers(); // authentication and active-failover connection redirect to master
8987

9088
final ArangoDatabase db = arangoDB.db();
9189

0 commit comments

Comments
 (0)