Merge pull request #996 from ctripcorp/bugfix/full_offset_begin

fix bug for unit test

Author: LanternLee

redis/redis-keeper/src/main/java/com/ctrip/xpipe/redis/keeper/handler/keeper/GapAllowSyncHandler.java

@@ -135,7 +135,7 @@ protected SyncAction anaRequest(SyncRequest request, RedisKeeperServer redisKeep
             XSyncContinue xsyncCont = null;
             if (request.proto == ReplStage.ReplProto.PSYNC) {
                 if(request.offset < preStage.getBegOffsetRepl()) {
-                    SyncAction.full("request offset < beginOffsetRepl");
+                    return SyncAction.full("request offset < beginOffsetRepl");
                 }
                 reqBacklogOffset = preStage.replOffset2BacklogOffset(request.offset);
             } else {

redis/redis-keeper/src/test/java/com/ctrip/xpipe/redis/keeper/handler/keeper/GapAllowSyncHandlerTest.java

@@ -232,6 +232,18 @@ public void testKeeperPartialSync_xcontinue() throws Exception {
         Assert.assertEquals(990, action.replOffset);
     }
 
+    @Test
+    public void testKeeperOffsetVerySmaller() throws Exception {
+        GapAllowSyncHandler.SyncRequest request = GapAllowSyncHandler.SyncRequest.psync("test-repl-id2", 1);
+        ReplStage curStage = new ReplStage("test-repl-id", 1, 1001, "test-master-uuid", new GtidSet("A:1-10"), new GtidSet("A:1-20"));
+        ReplStage preStage = new ReplStage("test-repl-id2", 100, 1);
+        Mockito.when(keeperRepl.currentStage()).thenReturn(curStage);
+        Mockito.when(keeperRepl.preStage()).thenReturn(preStage);
+
+        GapAllowSyncHandler.SyncAction action = handler.anaRequest(request, keeperServer, slave);
+        Assert.assertTrue(action.full);
+    }
+
     @Test
     public void testKeeperPartialSync_continue() throws Exception {
         ReplStage replStage = new ReplStage("test-repl-id1", 1, 11);