Skip to content

Implement load balancing #162

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.

Sign up for GitHub

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

Merged
merged 12 commits into from
Nov 23, 2017
Merged

Implement load balancing #162

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b7aa40d
Implement load balancing
Nov 10, 2017
340fbb9
Implement failover for singleServer with failover
Nov 13, 2017
a4785a1
Add property loading for `acquireHostList` and `loadBalancingStrategy`
Nov 13, 2017
210c5f4
Add load balancing docs
Nov 13, 2017
ae3f19a
snapshot version 4.3.0-SNAPSHOT
Nov 13, 2017
33774d7
Fix bug random host handler
Nov 13, 2017
1a11879
Fix test properties
Nov 14, 2017
f4f3e3b
Implement following redirects
Nov 14, 2017
a96178d
Load balancing/ fallback refactoring
Nov 14, 2017
5e13eee
Change redirect to response code 503 and header 'x-arango-endpoint'
mvollmary Nov 17, 2017
eab4c62
Fix acquireHostList db call
Nov 23, 2017
cc92394
Fix changelog
Nov 23, 2017
File filter

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
Add property loading for acquireHostList and loadBalancingStrategy
  • Loading branch information
mpv1989 committed Nov 13, 2017
commit a4785a15823f64509cc1f0b1ec27f8f93a929ad2
2 changes: 2 additions & 0 deletions src/main/java/com/arangodb/ArangoDB.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,8 @@ public Builder loadProperties(final InputStream in) throws ArangoDBException {
chunksize = loadChunkSize(properties, chunksize);
maxConnections = loadMaxConnections(properties, maxConnections);
protocol = loadProtocol(properties, protocol);
acquireHostList = loadAcquireHostList(properties, acquireHostList);
loadBalancingStrategy = loadLoadBalancingStrategy(properties, loadBalancingStrategy);
} catch (final IOException e) {
throw new ArangoDBException(e);
}
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/arangodb/internal/ArangoDBConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
package com.arangodb.internal;

import com.arangodb.Protocol;
import com.arangodb.entity.LoadBalancingStrategy;

/**
* @author Mark Vollmary
Expand All @@ -42,6 +43,8 @@ public class ArangoDBConstants {
public static final int MAX_CONNECTIONS_VST_DEFAULT = 1;
public static final int MAX_CONNECTIONS_HTTP_DEFAULT = 20;
public static final Protocol DEFAULT_NETWORK_PROTOCOL = Protocol.VST;
public static final boolean DEFAULT_ACQUIRE_HOST_LIST = false;
public static final LoadBalancingStrategy DEFAULT_LOAD_BALANCING_STRATEGY = LoadBalancingStrategy.NONE;

public static final String PATH_API_DOCUMENT = "/_api/document";
public static final String PATH_API_COLLECTION = "/_api/collection";
Expand Down
15 changes: 15 additions & 0 deletions src/main/java/com/arangodb/internal/InternalArangoDB.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

import com.arangodb.ArangoDBException;
import com.arangodb.Protocol;
import com.arangodb.entity.LoadBalancingStrategy;
import com.arangodb.entity.LogLevelEntity;
import com.arangodb.entity.Permissions;
import com.arangodb.entity.ServerRole;
Expand Down Expand Up @@ -66,6 +67,8 @@ public class InternalArangoDB<E extends ArangoExecutor, R, C extends VstConnecti
private static final String PROPERTY_KEY_V_STREAM_CHUNK_CONTENT_SIZE = "arangodb.chunksize";
private static final String PROPERTY_KEY_MAX_CONNECTIONS = "arangodb.connections.max";
private static final String PROPERTY_KEY_PROTOCOL = "arangodb.protocol";
private static final String PROPERTY_KEY_ACQUIRE_HOST_LIST = "arangodb.acquireHostList";
private static final String PROPERTY_KEY_LOAD_BALANCING_STRATEGY = "arangodb.loadBalancingStrategy";
protected static final String DEFAULT_PROPERTY_FILE = "/arangodb.properties";

public InternalArangoDB(final E executor, final ArangoSerialization util) {
Expand Down Expand Up @@ -138,6 +141,18 @@ protected static Protocol loadProtocol(final Properties properties, final Protoc
.toUpperCase());
}

protected static Boolean loadAcquireHostList(final Properties properties, final Boolean currentValue) {
return Boolean.parseBoolean(getProperty(properties, PROPERTY_KEY_ACQUIRE_HOST_LIST, currentValue,
ArangoDBConstants.DEFAULT_ACQUIRE_HOST_LIST));
}

protected static LoadBalancingStrategy loadLoadBalancingStrategy(
final Properties properties,
final LoadBalancingStrategy currentValue) {
return LoadBalancingStrategy.valueOf(getProperty(properties, PROPERTY_KEY_LOAD_BALANCING_STRATEGY, currentValue,
ArangoDBConstants.DEFAULT_LOAD_BALANCING_STRATEGY).toUpperCase());
}

private static <T> String getProperty(
final Properties properties,
final String key,
Expand Down