add various fixes

Author: tuhuynh27

.dockerignore

@@ -0,0 +1,15 @@
+.idea/
+.github/
+docs/
+binaries/
+build/
+.gradle/
+.DS_Store
+gradle.properties
+
+testproject/
+run.sh
+
+dump.kdb
+
+keva.test.properties

.gitignore

@@ -7,10 +7,6 @@ gradle.properties
 testproject/
 run.sh
 
-# data.zip
-# KevaData
-# KevaDataIndex
-
 dump.kdb
 
 keva.test.properties

.tokeignore

@@ -1,4 +1,4 @@
 docs/
 examples/
 gradle/
-.github/
+.github/

Dockerfile

@@ -0,0 +1,26 @@
+FROM openjdk:12 AS builder
+
+RUN mkdir -p /root/src/keva
+WORKDIR /root/src/keva
+
+COPY gradle ./gradle
+COPY build.gradle gradlew settings.gradle ./
+COPY ./server/build.gradle ./server/keva.properties ./server/
+RUN ./gradlew dependencies
+
+COPY . .
+RUN ./gradlew clean :server:build -x test
+
+FROM openjdk:12-jdk-alpine
+
+RUN mkdir -p /root/binary/keva
+WORKDIR /root/binary/keva
+
+COPY --from=builder /root/src/keva/server/build/libs/server-1.0-SNAPSHOT-all.jar /root/binary/keva/keva.jar
+
+EXPOSE 6767
+
+ENTRYPOINT ["java","-jar","keva.jar","--add-opens=java.base/sun.nio.ch=ALL-UNNAMED"]
+
+# docker build -t keva-server .
+# docker run -d --name keva-server --network=host -p 6767:6767 keva-server:latest

build.gradle

@@ -9,8 +9,8 @@ subprojects {
     apply plugin: 'maven-publish'
     apply plugin: 'jacoco'
 
-    group 'com.jinyframework'
-    version '0.3.3'
+    group 'dev.keva'
+    version '1.0.0'
 
     repositories {
         mavenCentral()
@@ -27,7 +27,7 @@ subprojects {
         testImplementation('org.junit.jupiter:junit-jupiter:5.6.2')
 
         // SLF4J as a facade
-        compile group: 'org.slf4j', name:'slf4j-api', version: '1.7.2'
+        implementation 'org.slf4j:slf4j-api:1.7.2'
     }
 
     jacocoTestReport {

docs/src/guide/install.md

@@ -8,7 +8,7 @@
 ## Download
 
 ```command
-curl -o /usr/local/bin/keva-server https://go.keva.dev/keva-server
+curl -L -o /usr/local/bin/keva-server https://download.keva.dev
 chmod +x /usr/local/bin/keva-server
 ```
 

server/build.gradle

@@ -11,14 +11,13 @@ repositories {
     mavenCentral()
 }
 
-def nettyVersion = '4.1.65.Final'
 dependencies {
-    compile project(':store')
+    implementation project(':store')
 
-    compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.0.9'
-    compile group: 'ch.qos.logback', name: 'logback-core', version: '1.0.9'
-    compile group: 'io.netty', name: 'netty-handler', version: "${nettyVersion}"
-    compile group: 'io.netty', name: 'netty-buffer', version: "${nettyVersion}"
+    implementation 'ch.qos.logback:logback-classic:1.2.6'
+    implementation 'ch.qos.logback:logback-core:1.2.6'
+    implementation 'io.netty:netty-handler:4.1.69.Final'
+    implementation 'io.netty:netty-buffer:4.1.69.Final'
 
     implementation 'com.google.guava:guava:31.0.1-jre'
     implementation 'org.reflections:reflections:0.10.1'
@@ -27,7 +26,7 @@ dependencies {
 
     // MTC lib depends on junit 4
     testImplementation group: 'junit', name: 'junit', version: '4.12'
-    testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.7.2")
+    testRuntimeOnly('org.junit.vintage:junit-vintage-engine:5.8.1')
 }
 
 shadowJar {

server/src/main/java/dev/keva/server/core/NettyServer.java

@@ -5,22 +5,20 @@
 import dev.keva.server.command.setup.CommandServiceImpl;
 import dev.keva.server.config.ConfigHolder;
 import dev.keva.server.replication.master.ReplicationService;
-import dev.keva.server.replication.master.ReplicationServiceImpl;
 import dev.keva.server.replication.slave.SlaveService;
-import dev.keva.server.replication.slave.SlaveServiceImpl;
 import dev.keva.server.storage.NoHeapStorageServiceImpl;
 import dev.keva.server.storage.StorageService;
 import dev.keva.store.NoHeapConfig;
 import dev.keva.store.NoHeapFactory;
 import dev.keva.store.NoHeapStore;
 import io.netty.bootstrap.ServerBootstrap;
+import io.netty.buffer.PooledByteBufAllocator;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelOption;
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.nio.NioServerSocketChannel;
-import io.netty.handler.logging.LogLevel;
-import io.netty.handler.logging.LoggingHandler;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
@@ -31,6 +29,8 @@
 
 @Slf4j
 public class NettyServer implements Server {
+    private static final int BUFFER_SIZE = 1024 * 1024;
+
     private final ConfigHolder config;
 
     // Executors
@@ -46,34 +46,40 @@ public class NettyServer implements Server {
     private CommandService commandService;
     @Getter // use for testing should change to dedicated command or extract from INFO
     private ReplicationService replicationService;
-    private WriteLog writeLog;
+    // private WriteLog writeLog;
     private Channel channel;
-    private ServerBootstrap server;
     private NoHeapStore noHeapStore;
 
     public NettyServer(ConfigHolder config) {
         this.config = config;
     }
 
     private void initServices(boolean isFreshStart) {
-        if (isFreshStart) {
-            writeLog = new WriteLog(config.getWriteLogSize());
-        }
+        // TODO: re-enable rep mode
+        // if (isFreshStart) {
+            // writeLog = new WriteLog(config.getWriteLogSize());
+        // }
         initStorageService(isFreshStart);
-        replicationService = new ReplicationServiceImpl(healthCheckerPool, repWorkerPool, storageService, writeLog);
+        // replicationService = new ReplicationServiceImpl(healthCheckerPool, repWorkerPool, storageService, writeLog);
 
         connectionService = new ConnectionServiceImpl();
         final CommandRegistrar commandRegistrar = new CommandRegistrar(storageService, replicationService, connectionService);
         commandService = new CommandServiceImpl(commandRegistrar.getHandlerMap(), replicationService);
-        slaveService = new SlaveServiceImpl(healthCheckerPool, writeLog, commandService);
+        // slaveService = new SlaveServiceImpl(healthCheckerPool, writeLog, commandService);
     }
 
     public ServerBootstrap bootstrapServer() {
         final ServerBootstrap b = new ServerBootstrap();
         b.group(bossGroup, workerGroup)
                 .channel(NioServerSocketChannel.class)
-                .handler(new LoggingHandler(LogLevel.TRACE))
-                .childHandler(new RedisCodecInitializer(new ServerHandler(connectionService, commandService)));
+                .childHandler(new RedisCodecInitializer(new ServerHandler(connectionService, commandService)))
+                .option(ChannelOption.SO_BACKLOG, 100)
+                .option(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT)
+                .childOption(ChannelOption.SO_RCVBUF, BUFFER_SIZE)
+                .childOption(ChannelOption.SO_SNDBUF, BUFFER_SIZE)
+                .childOption(ChannelOption.SO_KEEPALIVE, true)
+                .childOption(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT)
+                .childOption(ChannelOption.TCP_NODELAY, true);
         return b;
     }
 
@@ -110,8 +116,11 @@ public void shutdown() {
         healthCheckerPool.shutdown();
         bossGroup.shutdownGracefully();
         workerGroup.shutdownGracefully();
-        channel.close();
-        log.info("Database server at {} stopped", config.getPort());
+
+        if (channel != null) {
+            channel.close();
+        }
+        log.info("Keva server at {} stopped", config.getPort());
     }
 
     @Override
@@ -120,12 +129,15 @@ public void run(boolean isFreshStart) {
             initExecutors();
             initServices(isFreshStart);
             startSlaveService();
-            server = bootstrapServer();
+            ServerBootstrap server = bootstrapServer();
             final ChannelFuture sync = server.bind(config.getPort()).sync();
-            log.info("Database server started at {}", config.getPort());
+            sync.syncUninterruptibly();
+            log.info("Keva server started at {}", config.getPort());
 
-            channel = sync.channel();
-            channel.closeFuture().sync();
+            if (channel != null) {
+                channel = sync.channel();
+                channel.closeFuture().sync();
+            }
         } catch (InterruptedException e) {
             log.error("Failed to start server: ", e);
             Thread.currentThread().interrupt();

server/src/main/java/dev/keva/server/core/RedisCodecInitializer.java

@@ -6,6 +6,7 @@
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.ChannelPipeline;
 import io.netty.channel.socket.SocketChannel;
+import io.netty.handler.timeout.IdleStateHandler;
 
 public class RedisCodecInitializer extends ChannelInitializer<SocketChannel> {
     private ChannelHandler handler;
@@ -18,9 +19,10 @@ public RedisCodecInitializer() {
     }
 
     @Override
-    protected void initChannel(SocketChannel ch) throws Exception {
+    protected void initChannel(SocketChannel ch) {
         final ChannelPipeline p = ch.pipeline();
 
+        p.addLast(new IdleStateHandler(0, 0, 5 * 60));
         p.addLast(new RedisCommandDecoder());
         p.addLast(new RedisReplyEncoder());
 

server/src/main/java/dev/keva/server/core/ServerHandler.java

@@ -3,9 +3,11 @@
 import dev.keva.server.command.setup.CommandService;
 import dev.keva.server.protocol.redis.Command;
 import dev.keva.server.protocol.redis.Reply;
+import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
+import io.netty.handler.timeout.IdleStateEvent;
 import io.netty.util.AttributeKey;
 import lombok.extern.slf4j.Slf4j;
 
@@ -65,4 +67,16 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
         log.error("Handler exception caught: ", cause);
         ctx.close();
     }
+
+    @Override
+    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
+        if (evt instanceof IdleStateEvent) {
+            Channel channel = ctx.channel();
+            log.info("IdleStateEvent triggered, close channel " + channel);
+            channelUnregistered(ctx);
+            ctx.close();
+        } else {
+            super.userEventTriggered(ctx, evt);
+        }
+    }
 }

settings.gradle

@@ -1,5 +1,4 @@
 rootProject.name = 'keva'
 
-include 'cli-client'
 include 'server'
 include 'store'

store/build.gradle

@@ -8,7 +8,7 @@ java {
 }
 
 dependencies {
-    implementation 'net.openhft:chronicle-map:3.21.85'
+    implementation 'net.openhft:chronicle-map:3.21.86'
 }
 
 javadoc {