ZhouXY108
/
fastdfs-client-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:not use code

master
tanyawen01770 2023-01-29 09:45:14 +08:00
parent 4de15ae592
commit 2b4693643a
2 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/main/java/org/csource/fastdfs/TrackerClient.java
View File

@ -100,36 +100,37 @@ public class TrackerClient {
return connection; return connection;
} }
//do fail over //do fail over
if (length > 1) { int currentIndex = 0;
int currentIndex = trackerServer.getIndex(); if (trackerServer != null) {
int failOverCount = 0; currentIndex = trackerServer.getIndex();
while (failOverCount < length - 1) { }
failOverCount++; int failOverCount = 0;
currentIndex++; while (failOverCount < length - 1) {
if (currentIndex >= length) { failOverCount++;
currentIndex = 0; currentIndex++;
} if (currentIndex >= length) {
try { currentIndex = 0;
trackerServer = this.tracker_group.getTrackerServer(currentIndex);
if (trackerServer == null) {
throw new MyException("tracker server is empty!");
}
return trackerServer.getConnection();
} catch (IOException e) {
System.err.println("fail over trackerServer get connection error, failOverCount:" + failOverCount + "," + e.getMessage());
if (failOverCount == length - 1) {
throw e;
}
} catch (MyException e) {
System.err.println("fail over trackerServer get connection error, failOverCount:" + failOverCount + ", " + e.getMessage());
if (failOverCount == length - 1) {
throw e;
}
}
} }
try {
trackerServer = this.tracker_group.getTrackerServer(currentIndex);
if (trackerServer == null) {
throw new MyException("tracker server is empty!");
}
return trackerServer.getConnection();
} catch (IOException e) {
System.err.println("fail over trackerServer get connection error, failOverCount:" + failOverCount + "," + e.getMessage());
if (failOverCount == length - 1) {
throw e;
}
} catch (MyException e) {
System.err.println("fail over trackerServer get connection error, failOverCount:" + failOverCount + ", " + e.getMessage());
if (failOverCount == length - 1) {
throw e;
}
}
} }
return null; return null;
} }

6
src/test/java/org/csource/fastdfs/FdfsTest.java
View File

@ -33,7 +33,7 @@ public class FdfsTest {
TrackerClient tracker = new TrackerClient(); TrackerClient tracker = new TrackerClient();
trackerServer = tracker.getTrackerServer(); trackerServer = tracker.getTrackerServer();
StorageServer storageServer = null; StorageServer storageServer = null;
storageClient = new StorageClient(null, storageServer); storageClient = new StorageClient(trackerServer, storageServer);
} }
@After @After
@ -87,9 +87,9 @@ public class FdfsTest {
@Test @Test
public void download() throws Exception { public void download() throws Exception {
String[] uploadresult = {"group1", "M00/00/00/wKgBZV0phl2ASV1nAACk1tFxwrM3814331"}; String[] uploadresult = {"group1", "M00/00/00/J2fL12PVypeAWiGcAAM_gDeWVyw5817085"};
byte[] result = storageClient.download_file(uploadresult[0], uploadresult[1]); byte[] result = storageClient.download_file(uploadresult[0], uploadresult[1]);
String local_filename = "build.PNG"; String local_filename = "commitment.d2f57e10.jpg";
writeByteToFile(result, local_filename); writeByteToFile(result, local_filename);
File file = new File(local_filename); File file = new File(local_filename);
Assert.assertTrue(file.isFile()); Assert.assertTrue(file.isFile());