File tree Expand file tree Collapse file tree 12 files changed +7
-47
lines changed
core/src/main/java/com/arangodb
test-functional/src/test/java/com/arangodb Expand file tree Collapse file tree 12 files changed +7
-47
lines changed Original file line number Diff line number Diff line change @@ -590,21 +590,6 @@ workflows:
590
590
branches :
591
591
only :
592
592
- 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
608
593
609
594
test-non-func :
610
595
when :
Original file line number Diff line number Diff line change @@ -579,12 +579,10 @@ public Builder keepAliveInterval(final Integer keepAliveInterval) {
579
579
}
580
580
581
581
/**
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.
585
583
*
586
584
* <p>
587
- * The host list will be used for failover and load balancing.
585
+ * The host list will be used for load balancing.
588
586
* </p>
589
587
*
590
588
* @param acquireHostList whether automatically acquire a list of available hosts (default: false)
@@ -607,8 +605,7 @@ public Builder acquireHostListInterval(final Integer acquireHostListInterval) {
607
605
}
608
606
609
607
/**
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.
612
609
*
613
610
* @param loadBalancingStrategy the load balancing strategy to be used (default:
614
611
* {@link LoadBalancingStrategy#NONE}
Original file line number Diff line number Diff line change @@ -61,10 +61,8 @@ public Boolean getAllowDirtyRead() {
61
61
* ({@link AqlQueryOptions#streamTransactionId(String)}). The header set when creating the transaction decides
62
62
* about dirty reads for the entire transaction, not the individual read operations.
63
63
*
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.
65
65
* @return this
66
- * @see <a href="https://docs.arangodb.com/3.11/deploy/active-failover/administration/#reading-from-follower">API
67
- * Documentation</a>
68
66
*/
69
67
public AqlQueryOptions allowDirtyRead (final Boolean allowDirtyRead ) {
70
68
this .allowDirtyRead = allowDirtyRead ;
Original file line number Diff line number Diff line change @@ -64,8 +64,6 @@ public DocumentReadOptions ifMatch(final String ifMatch) {
64
64
/**
65
65
* @param allowDirtyRead Set to {@code true} allows reading from followers in an active-failover setup.
66
66
* @return options
67
- * @see <a href="https://docs.arangodb.com/stable/deploy/active-failover/administration/#reading-from-follower">API
68
- * Documentation</a>
69
67
* @since ArangoDB 3.4.0
70
68
*/
71
69
public DocumentReadOptions allowDirtyRead (final Boolean allowDirtyRead ) {
Original file line number Diff line number Diff line change @@ -63,8 +63,6 @@ public GraphDocumentReadOptions ifMatch(final String ifMatch) {
63
63
/**
64
64
* @param allowDirtyRead Set to {@code true} allows reading from followers in an active-failover setup.
65
65
* @return options
66
- * @see <a href="https://docs.arangodb.com/stable/deploy/active-failover/administration/#reading-from-follower">API
67
- * Documentation</a>
68
66
* @since ArangoDB 3.4.0
69
67
*/
70
68
public GraphDocumentReadOptions allowDirtyRead (final Boolean allowDirtyRead ) {
Original file line number Diff line number Diff line change @@ -140,8 +140,6 @@ public Boolean getAllowDirtyRead() {
140
140
/**
141
141
* @param allowDirtyRead Set to {@code true} allows reading from followers in an active-failover setup.
142
142
* @return options
143
- * @see <a href="https://docs.arangodb.com/stable/deploy/active-failover/administration/#reading-from-follower">API
144
- * Documentation</a>
145
143
* @since ArangoDB 3.4.0
146
144
*/
147
145
public StreamTransactionOptions allowDirtyRead (final Boolean allowDirtyRead ) {
Original file line number Diff line number Diff line change 1
1
#! /bin/bash
2
2
3
3
# Configuration environment variables:
4
- # STARTER_MODE: (single|cluster|activefailover ), default single
4
+ # STARTER_MODE: (single|cluster), default single
5
5
# DOCKER_IMAGE: ArangoDB docker image, default docker.io/arangodb/arangodb:latest
6
6
# STARTER_DOCKER_IMAGE: ArangoDB Starter docker image, default docker.io/arangodb/arangodb-starter:latest
7
7
# SSL: (true|false), default false
@@ -111,9 +111,3 @@ for a in ${COORDINATORS[*]} ; do
111
111
echo " $SCHEME ://$a "
112
112
echo " "
113
113
done
114
-
115
- if [ " $STARTER_MODE " == " activefailover" ]; then
116
- LEADER=$( " $LOCATION " /find_active_endpoint.sh)
117
- echo " Leader: $SCHEME ://$LEADER "
118
- echo " "
119
- fi
Original file line number Diff line number Diff line change @@ -723,7 +723,7 @@ void getDocumentsWithCustomShardingKey(ArangoCollectionAsync c) throws Execution
723
723
@ ParameterizedTest
724
724
@ MethodSource ("asyncCols" )
725
725
void getDocumentsDirtyRead (ArangoCollectionAsync collection ) throws ExecutionException , InterruptedException {
726
- assumeTrue (isCluster ()); // skip activefailover
726
+ assumeTrue (isCluster ());
727
727
final Collection <BaseDocument > values = new ArrayList <>();
728
728
values .add (new BaseDocument ("1" ));
729
729
values .add (new BaseDocument ("2" ));
Original file line number Diff line number Diff line change @@ -773,7 +773,7 @@ void getDocumentsWithCustomShardingKey(ArangoCollection c) {
773
773
@ ParameterizedTest
774
774
@ MethodSource ("cols" )
775
775
void getDocumentsDirtyRead (ArangoCollection collection ) {
776
- assumeTrue (isCluster ()); // skip activefailover
776
+ assumeTrue (isCluster ());
777
777
final Collection <BaseDocument > values = new ArrayList <>();
778
778
values .add (new BaseDocument ("1" ));
779
779
values .add (new BaseDocument ("2" ));
Original file line number Diff line number Diff line change @@ -188,9 +188,6 @@ void createDatabaseWithUsers(ArangoDBAsync arangoDB) throws InterruptedException
188
188
assertThat (retrievedUser .getActive ()).isTrue ();
189
189
assertThat (retrievedUser .getExtra ()).isEqualTo (extra );
190
190
191
- // needed for active-failover tests only
192
- Thread .sleep (2_000 );
193
-
194
191
ArangoDBAsync arangoDBTestUser = new ArangoDB .Builder ()
195
192
.loadProperties (config )
196
193
.user ("testUser" )
Original file line number Diff line number Diff line change @@ -192,9 +192,6 @@ void createDatabaseWithUsers(ArangoDB arangoDB) throws InterruptedException {
192
192
assertThat (retrievedUser .getActive ()).isTrue ();
193
193
assertThat (retrievedUser .getExtra ()).isEqualTo (extra );
194
194
195
- // needed for active-failover tests only
196
- Thread .sleep (2_000 );
197
-
198
195
ArangoDB arangoDBTestUser = new ArangoDB .Builder ()
199
196
.loadProperties (config )
200
197
.user ("testUser" )
Original file line number Diff line number Diff line change @@ -56,7 +56,6 @@ void multiThread() throws Exception {
56
56
final ArangoDB arangoDB = new ArangoDB .Builder ()
57
57
.loadProperties (ConfigUtils .loadConfig ())
58
58
.build ();
59
- arangoDB .getUsers (); // authentication and active-failover connection redirect to master
60
59
61
60
final Collection <String > result = new ConcurrentLinkedQueue <>();
62
61
final Thread fast = new Thread (() -> {
@@ -85,7 +84,6 @@ void multiThreadSameDatabases() throws Exception {
85
84
final ArangoDB arangoDB = new ArangoDB .Builder ()
86
85
.loadProperties (ConfigUtils .loadConfig ())
87
86
.build ();
88
- arangoDB .getUsers (); // authentication and active-failover connection redirect to master
89
87
90
88
final ArangoDatabase db = arangoDB .db ();
91
89
You can’t perform that action at this time.
0 commit comments