Skip to content

Commit 94e330c

Browse files
author
qifanwang
committed
fix bug for unit test
1 parent 48d5f53 commit 94e330c

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ protected SyncAction anaRequest(SyncRequest request, RedisKeeperServer redisKeep
135135
XSyncContinue xsyncCont = null;
136136
if (request.proto == ReplStage.ReplProto.PSYNC) {
137137
if(request.offset < preStage.getBegOffsetRepl()) {
138-
SyncAction.full("request offset < beginOffsetRepl");
138+
return SyncAction.full("request offset < beginOffsetRepl");
139139
}
140140
reqBacklogOffset = preStage.replOffset2BacklogOffset(request.offset);
141141
} else {

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,18 @@ public void testKeeperPartialSync_xcontinue() throws Exception {
232232
Assert.assertEquals(990, action.replOffset);
233233
}
234234

235+
@Test
236+
public void testKeeperOffsetVerySmaller() throws Exception {
237+
GapAllowSyncHandler.SyncRequest request = GapAllowSyncHandler.SyncRequest.psync("test-repl-id2", 1);
238+
ReplStage curStage = new ReplStage("test-repl-id", 1, 1001, "test-master-uuid", new GtidSet("A:1-10"), new GtidSet("A:1-20"));
239+
ReplStage preStage = new ReplStage("test-repl-id2", 100, 1);
240+
Mockito.when(keeperRepl.currentStage()).thenReturn(curStage);
241+
Mockito.when(keeperRepl.preStage()).thenReturn(preStage);
242+
243+
GapAllowSyncHandler.SyncAction action = handler.anaRequest(request, keeperServer, slave);
244+
Assert.assertTrue(action.full);
245+
}
246+
235247
@Test
236248
public void testKeeperPartialSync_continue() throws Exception {
237249
ReplStage replStage = new ReplStage("test-repl-id1", 1, 11);

redis/redis-meta/src/test/java/com/ctrip/xpipe/redis/meta/server/meta/CurrentMetaTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ public void testGetGtidSet() {
362362
Assert.assertEquals("a1:1-10:15-20", gtidSet.toString());
363363

364364
gtidSet = currentMeta.getGtidSet(heteroClusterDbId, "b1");
365-
Assert.assertEquals("", gtidSet.toString());
365+
Assert.assertEquals("\"\"", gtidSet.toString());
366366
}
367367

368368
@Test

0 commit comments

Comments
 (0)