Skip to content

Version 8.0 #606

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 12 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
removed active-failover tests
  • Loading branch information
rashtao committed Jun 6, 2025
commit ddd517dd4278a8c96434f9efc06bc47226a9e5c2
15 changes: 0 additions & 15 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -590,21 +590,6 @@ workflows:
branches:
only:
- main
- test:
name: test-activefailover-<<matrix.docker-img>>
matrix:
parameters:
docker-img:
- 'docker.io/arangodb/arangodb:3.11'
- 'docker.io/arangodb/enterprise:3.11'
topology:
- 'activefailover'
filters:
tags:
only: /^v.*/
branches:
only:
- main

test-non-func:
when:
Expand Down
9 changes: 3 additions & 6 deletions core/src/main/java/com/arangodb/ArangoDB.java
Original file line number Diff line number Diff line change
Expand Up @@ -579,12 +579,10 @@ public Builder keepAliveInterval(final Integer keepAliveInterval) {
}

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

/**
* Sets the load balancing strategy to be used in an ArangoDB cluster setup. In case of Active-Failover
* deployment set to {@link LoadBalancingStrategy#NONE} or not set at all, since that would be the default.
* Sets the load balancing strategy to be used in an ArangoDB cluster setup.
*
* @param loadBalancingStrategy the load balancing strategy to be used (default:
* {@link LoadBalancingStrategy#NONE}
Expand Down
4 changes: 1 addition & 3 deletions core/src/main/java/com/arangodb/model/AqlQueryOptions.java
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,8 @@ public Boolean getAllowDirtyRead() {
* ({@link AqlQueryOptions#streamTransactionId(String)}). The header set when creating the transaction decides
* about dirty reads for the entire transaction, not the individual read operations.
*
* @param allowDirtyRead Set to {@code true} allows reading from followers in an active-failover setup.
* @param allowDirtyRead Set to {@code true} allows reading from followers.
* @return this
* @see <a href="https://docs.arangodb.com/3.11/deploy/active-failover/administration/#reading-from-follower">API
* Documentation</a>
*/
public AqlQueryOptions allowDirtyRead(final Boolean allowDirtyRead) {
this.allowDirtyRead = allowDirtyRead;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,6 @@ public DocumentReadOptions ifMatch(final String ifMatch) {
/**
* @param allowDirtyRead Set to {@code true} allows reading from followers in an active-failover setup.
* @return options
* @see <a href="https://docs.arangodb.com/stable/deploy/active-failover/administration/#reading-from-follower">API
* Documentation</a>
* @since ArangoDB 3.4.0
*/
public DocumentReadOptions allowDirtyRead(final Boolean allowDirtyRead) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,6 @@ public GraphDocumentReadOptions ifMatch(final String ifMatch) {
/**
* @param allowDirtyRead Set to {@code true} allows reading from followers in an active-failover setup.
* @return options
* @see <a href="https://docs.arangodb.com/stable/deploy/active-failover/administration/#reading-from-follower">API
* Documentation</a>
* @since ArangoDB 3.4.0
*/
public GraphDocumentReadOptions allowDirtyRead(final Boolean allowDirtyRead) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,6 @@ public Boolean getAllowDirtyRead() {
/**
* @param allowDirtyRead Set to {@code true} allows reading from followers in an active-failover setup.
* @return options
* @see <a href="https://docs.arangodb.com/stable/deploy/active-failover/administration/#reading-from-follower">API
* Documentation</a>
* @since ArangoDB 3.4.0
*/
public StreamTransactionOptions allowDirtyRead(final Boolean allowDirtyRead) {
Expand Down
8 changes: 1 addition & 7 deletions docker/start_db.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

# Configuration environment variables:
# STARTER_MODE: (single|cluster|activefailover), default single
# STARTER_MODE: (single|cluster), default single
# DOCKER_IMAGE: ArangoDB docker image, default docker.io/arangodb/arangodb:latest
# STARTER_DOCKER_IMAGE: ArangoDB Starter docker image, default docker.io/arangodb/arangodb-starter:latest
# SSL: (true|false), default false
Expand Down Expand Up @@ -111,9 +111,3 @@ for a in ${COORDINATORS[*]} ; do
echo "$SCHEME://$a"
echo ""
done

if [ "$STARTER_MODE" == "activefailover" ]; then
LEADER=$("$LOCATION"/find_active_endpoint.sh)
echo "Leader: $SCHEME://$LEADER"
echo ""
fi
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,7 @@ void getDocumentsWithCustomShardingKey(ArangoCollectionAsync c) throws Execution
@ParameterizedTest
@MethodSource("asyncCols")
void getDocumentsDirtyRead(ArangoCollectionAsync collection) throws ExecutionException, InterruptedException {
assumeTrue(isCluster()); // skip activefailover
assumeTrue(isCluster());
final Collection<BaseDocument> values = new ArrayList<>();
values.add(new BaseDocument("1"));
values.add(new BaseDocument("2"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -773,7 +773,7 @@ void getDocumentsWithCustomShardingKey(ArangoCollection c) {
@ParameterizedTest
@MethodSource("cols")
void getDocumentsDirtyRead(ArangoCollection collection) {
assumeTrue(isCluster()); // skip activefailover
assumeTrue(isCluster());
final Collection<BaseDocument> values = new ArrayList<>();
values.add(new BaseDocument("1"));
values.add(new BaseDocument("2"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,9 +188,6 @@ void createDatabaseWithUsers(ArangoDBAsync arangoDB) throws InterruptedException
assertThat(retrievedUser.getActive()).isTrue();
assertThat(retrievedUser.getExtra()).isEqualTo(extra);

// needed for active-failover tests only
Thread.sleep(2_000);

ArangoDBAsync arangoDBTestUser = new ArangoDB.Builder()
.loadProperties(config)
.user("testUser")
Expand Down
3 changes: 0 additions & 3 deletions test-functional/src/test/java/com/arangodb/ArangoDBTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,6 @@ void createDatabaseWithUsers(ArangoDB arangoDB) throws InterruptedException {
assertThat(retrievedUser.getActive()).isTrue();
assertThat(retrievedUser.getExtra()).isEqualTo(extra);

// needed for active-failover tests only
Thread.sleep(2_000);

ArangoDB arangoDBTestUser = new ArangoDB.Builder()
.loadProperties(config)
.user("testUser")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ void multiThread() throws Exception {
final ArangoDB arangoDB = new ArangoDB.Builder()
.loadProperties(ConfigUtils.loadConfig())
.build();
arangoDB.getUsers(); // authentication and active-failover connection redirect to master

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

final ArangoDatabase db = arangoDB.db();

Expand Down