Skip to content
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

Jump to bottom

fixbug/install snapshot bug #80

Merged
merged 16 commits into from
Apr 1, 2019
Merged

fixbug/install snapshot bug #80

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
b462171
(fix) required eof
fengjiachun Mar 29, 2019
6d1307f
(fix) typo
fengjiachun Mar 29, 2019
50df9e5
(fix) read file bug
fengjiachun Mar 29, 2019
9dd1c28
(fix) format
fengjiachun Mar 29, 2019
5c454f3
(fix) code format
fengjiachun Mar 29, 2019
81b66f5
(fix) NodeTest's code format
fengjiachun Mar 29, 2019
35e6b52
(fix) FileService unit test
fengjiachun Mar 30, 2019
cd2930c
(fix) large snapshot unit test
fengjiachun Mar 30, 2019
e4d128b
(fix) add install snapshot rpc timeout, default is 5 min
fengjiachun Mar 30, 2019
376e6a6
(fix) code format
fengjiachun Mar 30, 2019
477c702
(fix) an error log is needed on copy failed
fengjiachun Mar 30, 2019
748b3fb
(fix) code format
fengjiachun Mar 30, 2019
83c2d36
(fix) typo
fengjiachun Mar 30, 2019
182d422
(fix) add unit test: testInstallLargeSnapshot()
fengjiachun Mar 31, 2019
2ce4be0
(fix) minor fix
fengjiachun Mar 31, 2019
8e55f93
(fix) add more detailed error log on copy failed
fengjiachun Mar 31, 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
4 changes: 1 addition & 3 deletions jraft-core/src/main/java/com/alipay/sofa/jraft/storage/FileService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,7 @@ public Message handleGetFile(GetFileRequest request, RpcRequestClosure done) {
final int read = reader
.readFile(dataBuffer, request.getFilename(), request.getOffset(), request.getCount());
responseBuilder.setReadSize(read);
if (read == -1) {
responseBuilder.setEof(true);
}
responseBuilder.setEof(read == -1);
final ByteBuffer buf = dataBuffer.getBuffer();
buf.flip();
if (!buf.hasRemaining()) {
Expand Down
4 changes: 2 additions & 2 deletions jraft-core/src/main/java/com/alipay/sofa/jraft/storage/io/LocalDirReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ protected int readFileWithMeta(ByteBufferCollector buf, String fileName, Message
} else {
final long fsize = file.length();
if (fsize < 0) {
LOG.warn("Invlaid file length {}", filePath);
LOG.warn("Invalid file length {}", filePath);
return -1;
}
if (fsize == offset + maxCount) {
if (fsize == offset + nread) {
return -1;
} else {
return totalRead;
Expand Down
37 changes: 36 additions & 1 deletion jraft-core/src/test/java/com/alipay/sofa/jraft/storage/FileServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@
import com.alipay.sofa.jraft.test.TestUtils;
import com.google.protobuf.Message;

import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;

public class FileServiceTest {
Expand Down Expand Up @@ -107,8 +109,41 @@ public void testGetFileData() throws IOException {
Message msg = FileService.getInstance().handleGetFile(request, new RpcRequestClosure(bizContext, asyncContext));
assertTrue(msg instanceof RpcRequests.GetFileResponse);
RpcRequests.GetFileResponse response = (RpcRequests.GetFileResponse) msg;
assertEquals(response.getEof(), true);
assertTrue(response.getEof());
assertEquals("jraft is great!", new String(response.getData().toByteArray()));
assertEquals(-1, response.getReadSize());
}

private String writeLargeData() throws IOException {
File file = new File(this.path + File.separator + "data");
String data = "jraft is great!";
for (int i = 0; i < 1000; i++) {
FileUtils.writeStringToFile(file, data, true);
}
return data;
}

@Test
public void testGetLargeFileData() throws IOException {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这个测试还是不够的，还是希望能模拟真实的情况，节点添加下安装较大的 snapshot ，可以模拟出来的。

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这个测试更类似单元测试，放到 FileServiceTest 更合适，这里更多还是模拟运行的集成测试。

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

测试还没完成，这个只是 FileService 的测试，在 NodeTest 中还会补充一个 InstallSnapshot 的测试

final String data = writeLargeData();
long readerId = FileService.getInstance().addReader(this.fileReader);
RpcRequests.GetFileRequest request = RpcRequests.GetFileRequest.newBuilder().setCount(2048)
.setFilename("data").setOffset(0).setReaderId(readerId).build();
BizContext bizContext = Mockito.mock(BizContext.class);
AsyncContext asyncContext = Mockito.mock(AsyncContext.class);
Message msg = FileService.getInstance().handleGetFile(request, new RpcRequestClosure(bizContext, asyncContext));
assertTrue(msg instanceof RpcRequests.GetFileResponse);
RpcRequests.GetFileResponse response = (RpcRequests.GetFileResponse) msg;
assertFalse(response.getEof());
final byte[] sourceArray = data.getBytes();
final byte[] respData = response.getData().toByteArray();
final int length = sourceArray.length;
int offset = 0;
while (offset + length <= respData.length) {
final byte[] respArray = new byte[length];
System.arraycopy(respData, offset, respArray, 0, length);
assertArrayEquals(sourceArray, respArray);
offset += length;
}
}
}