Skip to content

Utilize 'keep-alive' #57

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

Draft
johnerikhalse wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Utilize 'keep-alive' #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
77 changes: 65 additions & 12 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,14 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>

<veidemann.api.version>v1.0.0-beta.25</veidemann.api.version>
<veidemann.api.version>v1.0.1</veidemann.api.version>
<veidemann.commons.version>v0.7.0</veidemann.commons.version>
<veidemann.rethinkdbadapter.version>v0.10.1</veidemann.rethinkdbadapter.version>
<io.opentracing.version>0.33.0</io.opentracing.version>
<io.grpc.version>1.59.0-SNAPSHOT</io.grpc.version>

<com.github.netflix.concurrency-limits.version>0.3.7</com.github.netflix.concurrency-limits.version>
<log4j.version>2.17.1</log4j.version>
Expand Down Expand Up @@ -75,6 +76,32 @@
<version>2.2.5</version>
</dependency>

<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-core</artifactId>
<version>${io.grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
<version>${io.grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-services</artifactId>
<version>${io.grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>${io.grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
<version>${io.grpc.version}</version>
</dependency>

<dependency>
<groupId>com.github.netflix.concurrency-limits</groupId>
<artifactId>concurrency-limits-core</artifactId>
Expand Down Expand Up @@ -148,6 +175,14 @@
<version>${log4j.version}</version>
</dependency>

<!-- Nashorn dependency needed for jdk15 and later -->
<!-- used by RethinkDb query compiler -->
<dependency>
<groupId>org.openjdk.nashorn</groupId>
<artifactId>nashorn-core</artifactId>
<version>15.4</version>
</dependency>

<!-- Test dependencies -->
<dependency>
<groupId>org.assertj</groupId>
Expand All @@ -158,31 +193,37 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.5.15</version>
<version>5.4.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<version>1.7.0</version>
<version>1.10.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.7.0</version>
<version>5.10.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.7.0</version>
<version>5.10.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>5.7.0</version>
<version>5.10.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-testing</artifactId>
<version>1.59.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -195,19 +236,31 @@
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M5</version>
<version>3.1.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.0.0-M6</version>
<version>3.1.2</version>
</plugin>

<!-- Make version number available for application -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.0</version>
<configuration>
<archive>
<manifest>
Expand All @@ -219,7 +272,7 @@
<plugin>
<groupId>com.google.cloud.tools</groupId>
<artifactId>jib-maven-plugin</artifactId>
<version>3.2.1</version>
<version>3.3.2</version>
<configuration>
<to>
<image>${project.artifactId}:${project.version}</image>
Expand Down
15 changes: 8 additions & 7 deletions src/main/java/no/nb/nna/veidemann/controller/ControllerApiServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,7 @@
*/
package no.nb.nna.veidemann.controller;

import io.grpc.BindableService;
import io.grpc.Server;
import io.grpc.ServerBuilder;
import io.grpc.ServerInterceptor;
import io.grpc.ServerInterceptors;
import io.grpc.ServerServiceDefinition;
import io.grpc.*;
import io.opentracing.contrib.grpc.TracingServerInterceptor;
import io.opentracing.contrib.grpc.TracingServerInterceptor.ServerRequestAttribute;
import io.opentracing.util.GlobalTracer;
Expand Down Expand Up @@ -70,7 +65,7 @@ public interface JobExecutionListener {

public ControllerApiServer(Settings settings, UserRoleMapper userRoleMapper, ScopeServiceClient scopeServiceClient,
LogServiceClient logServiceClient) {
this(settings, ServerBuilder.forPort(settings.getApiPort()), userRoleMapper, scopeServiceClient, logServiceClient);
this(settings, Grpc.newServerBuilderForPort(settings.getApiPort(), InsecureServerCredentials.create()), userRoleMapper, scopeServiceClient, logServiceClient);
}

public ControllerApiServer(Settings settings, ServerBuilder<?> serverBuilder, UserRoleMapper userRoleMapper, ScopeServiceClient scopeServiceClient, LogServiceClient logServiceClient) {
Expand All @@ -81,6 +76,12 @@ public ControllerApiServer(Settings settings, ServerBuilder<?> serverBuilder, Us
this.logServiceClient = logServiceClient;
threadPool = Executors.newCachedThreadPool();
serverBuilder.executor(threadPool);
if (serverBuilder instanceof io.grpc.netty.NettyServerBuilder) {
serverBuilder.keepAliveTime(15, TimeUnit.SECONDS);
serverBuilder.keepAliveTimeout(10, TimeUnit.SECONDS);
serverBuilder.permitKeepAliveTime(5, TimeUnit.SECONDS);
serverBuilder.permitKeepAliveWithoutCalls(true);
}
}

/**
Expand Down