Apache9 commented on code in PR #5119:
URL: https://github.com/apache/hbase/pull/5119#discussion_r1143501140
##########
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AsyncFSWAL.java:
##########
@@ -778,32 +774,35 @@ private void waitForSafePoint() {
}
}
- protected final long closeWriter(AsyncWriter writer, Path path) {
- if (writer != null) {
- inflightWALClosures.put(path.getName(), writer);
- long fileLength = writer.getLength();
- closeExecutor.execute(() -> {
- try {
- writer.close();
- } catch (IOException e) {
- LOG.warn("close old writer failed", e);
- } finally {
- inflightWALClosures.remove(path.getName());
- }
- });
- return fileLength;
- } else {
- return 0L;
- }
+ private void closeWriter(AsyncWriter writer, Path path) {
+ inflightWALClosures.put(path.getName(), writer);
+ closeExecutor.execute(() -> {
+ try {
+ writer.close();
+ } catch (IOException e) {
+ LOG.warn("close old writer failed", e);
+ } finally {
+ // call this even if the above close fails, as there is no other
chance we can set closed to
+ // true, it will not cause big problems.
+ markClosedAndClean(path);
+ inflightWALClosures.remove(path.getName());
+ }
+ });
}
@Override
protected void doReplaceWriter(Path oldPath, Path newPath, AsyncWriter
nextWriter)
throws IOException {
Preconditions.checkNotNull(nextWriter);
waitForSafePoint();
- long oldFileLen = closeWriter(this.writer, oldPath);
- logRollAndSetupWalProps(oldPath, newPath, oldFileLen);
+ if (writer != null) {
+ long oldFileLen = writer.getLength();
+ logRollAndSetupWalProps(oldPath, newPath, oldFileLen);
+ closeWriter(writer, oldPath);
+ } else {
+ logRollAndSetupWalProps(oldPath, newPath, 0);
Review Comment:
I do not get the point... What is the problem here? The intention here is to
logRollAndSetupWalProps before closing, so in the async thread, we can make
sure that the file is already in walFile2Props.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
