Skip to content

Commit 2465542

Browse files
authored
fix(tsfile): propagate IOException on writer close instead of swallowing it (#899)
1 parent 9ec0abf commit 2465542

4 files changed

Lines changed: 4 additions & 14 deletions

File tree

java/common/src/main/resources/org/apache/tsfile/i18n/messages.properties

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,6 @@ log.write.flush_chunk_groups = start to flush chunk groups, memory space occupy:
202202
# TsFileWriter / AbstractTableModelTsFileWriter — close file (2 files, 1 key)
203203
log.write.close_file = start close file
204204

205-
# AbstractTableModelTsFileWriter — close file exception (1 site)
206-
log.write.close_file_exception = Meet exception when close file writer.
207-
208205
# TsFileWriter / AbstractTableModelTsFileWriter — page size vs chunk group size warn (2 files, 1 key)
209206
log.write.page_size_warn = TsFile's page size {} is greater than chunk group size {}, please enlarge the chunk group size or decrease page size.
210207

java/common/src/main/resources/org/apache/tsfile/i18n/messages_zh.properties

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,6 @@ log.write.flush_chunk_groups = 开始刷新 chunk groups,占用内存空间: {
202202
# TsFileWriter / AbstractTableModelTsFileWriter — close file (2 files, 1 key)
203203
log.write.close_file = 开始关闭文件
204204

205-
# AbstractTableModelTsFileWriter — close file exception (1 site)
206-
log.write.close_file_exception = 关闭文件 writer 时发生异常。
207-
208205
# TsFileWriter / AbstractTableModelTsFileWriter — page size vs chunk group size warn (2 files, 1 key)
209206
log.write.page_size_warn = TsFile 的 page size {} 大于 chunk group size {},请增大 chunk group size 或减小 page size。
210207

java/tsfile/src/main/java/org/apache/tsfile/write/v4/AbstractTableModelTsFileWriter.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -271,13 +271,9 @@ public void addTsFileProperty(String key, byte[] value) {
271271
*/
272272
@Override
273273
@TsFileApi
274-
public void close() {
274+
public void close() throws IOException {
275275
LOG.info(Messages.get("log.write.close_file"));
276-
try {
277-
flush();
278-
fileWriter.endFile();
279-
} catch (IOException e) {
280-
LOG.warn(Messages.get("log.write.close_file_exception"), e);
281-
}
276+
flush();
277+
fileWriter.endFile();
282278
}
283279
}

java/tsfile/src/main/java/org/apache/tsfile/write/v4/ITsFileWriter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public interface ITsFileWriter extends AutoCloseable {
3232
void write(Tablet tablet) throws IOException, WriteProcessException;
3333

3434
@TsFileApi
35-
void close();
35+
void close() throws IOException;
3636

3737
@TsFileApi
3838
void write(TSRecord record) throws IOException, WriteProcessException;

0 commit comments

Comments
 (0)