Skip to content

Add support for specifying default Direct TCP options using System properties #299

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
kushagraThapar merged 8 commits into from
Dec 18, 2019
Merged

Add support for specifying default Direct TCP options using System properties #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
775a113
Configs.getProtocol now accepts in priority order -Dcosmos.directMode…
Dec 15, 2019
4410763
ReadMyWritesConsistencyTest now sets document data field size and Rnt…
Dec 16, 2019
2847990
Removed option to specify document data field size on ReadMyWritesCon…
Dec 16, 2019
4db2feb
Enclosed static initializer in try/finally to reduce chance of unexpe…
Dec 17, 2019
716eced
Bug fix and tweaks based on code review feedback
Dec 17, 2019
d9f86ff
Increased request timer resolution from 5 to 100 ms
Dec 17, 2019
b7bb71d
Decreased request timer resolution from 100 to 5 ms
Dec 17, 2019
c24ac96
Added RntbdTransportClient.Options.requestTimerResolution property fo…
Dec 17, 2019
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
1 change: 0 additions & 1 deletion benchmark/src/main/java/com/microsoft/azure/cosmosdb/benchmark/ReadMyWriteWorkflow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
import com.microsoft.azure.cosmosdb.SqlQuerySpec;
import com.microsoft.azure.cosmosdb.internal.Utils;
import com.microsoft.azure.cosmosdb.rx.internal.NotFoundException;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.RandomUtils;
import rx.Observable;
import rx.Subscriber;
Expand Down
6 changes: 0 additions & 6 deletions ...ark/src/test/java/com/microsoft/azure/cosmosdb/benchmark/ReadMyWritesConsistencyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,6 @@ public class ReadMyWritesConsistencyTest {
StringUtils.defaultString(Strings.emptyToNull(
System.getenv().get("DESIRED_CONSISTENCY")), "Session"));

private final String directModeProtocol =
System.getProperty("azure.cosmos.directModeProtocol",
StringUtils.defaultString(Strings.emptyToNull(
System.getenv().get("DIRECT_MODE_PROTOCOL")), Protocol.Tcp.name()));

private final int initialCollectionThroughput = 10_000;

private final String maxRunningTime =
Expand Down Expand Up @@ -122,7 +117,6 @@ public void readMyWrites(boolean useNameLink) throws Exception {
Configuration cfg = new Configuration();
new JCommander(cfg, StringUtils.split(cmd));

logger.info("azure.cosmos.directModeProtocol={}, {}", directModeProtocol, cfg);
AtomicInteger success = new AtomicInteger();
AtomicInteger error = new AtomicInteger();

Expand Down
8 changes: 7 additions & 1 deletion commons/src/main/java/com/microsoft/azure/cosmosdb/rx/internal/Configs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,13 @@ public SslContext getSslContext() {
}

public Protocol getProtocol() {
String protocol = getJVMConfigAsString(PROTOCOL, DEFAULT_PROTOCOL.name());

String protocol = getJVMConfigAsString(PROTOCOL, StringUtils.defaultString(
StringUtils.defaultString(
System.getProperty("azure.cosmos.directModeProtocol"),
System.getenv("DIRECT_MODE_PROTOCOL")),
DEFAULT_PROTOCOL.name()));

try {
return Protocol.valueOf(WordUtils.capitalize(protocol.toLowerCase()));
} catch (Exception e) {
Expand Down
8 changes: 7 additions & 1 deletion commons/src/test/java/com/microsoft/azure/cosmosdb/rx/internal/ConfigsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import static org.assertj.core.api.Assertions.assertThat;

import com.microsoft.azure.cosmosdb.internal.directconnectivity.Protocol;
import org.apache.commons.lang3.StringUtils;
import org.testng.annotations.Test;

public class ConfigsTests {
Expand All @@ -45,7 +46,12 @@ public void maxHttpBodyLength() {
@Test(groups = { "unit" })
public void getProtocol() {
Configs config = new Configs();
assertThat(config.getProtocol()).isEqualTo(Protocol.valueOf(System.getProperty("cosmos.directModeProtocol", "Tcp")));
Protocol expected = Protocol.valueOf(System.getProperty("cosmos.directModeProtocol",
System.getProperty("azure.cosmos.directModeProtocol",
StringUtils.defaultString(
System.getenv("DIRECT_MODE_PROTOCOL"),
"Tcp"))));
assertThat(config.getProtocol()).isEqualTo(expected);
}

@Test(groups = { "unit" })
Expand Down
6 changes: 6 additions & 0 deletions direct-impl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ SOFTWARE.
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<test.groups>unit</test.groups>
<guava.version>27.0.1-jre</guava.version>
<jackson-datatype-jsr310.version>2.9.9</jackson-datatype-jsr310.version>
<metrics.version>4.1.0</metrics.version>
<micrometer.version>1.2.0</micrometer.version>
</properties>
Expand Down Expand Up @@ -295,6 +296,11 @@ SOFTWARE.
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>${jackson-datatype-jsr310.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
Expand Down
Loading