Skip to content

Commit aa82589

Browse files
committed
Add failsafe in case of missing pipeout dir
1 parent cae817a commit aa82589

File tree

2 files changed

+18
-10
lines changed

2 files changed

+18
-10
lines changed

sql/hive-thriftserver/v1.2/src/main/java/org/apache/hive/service/cli/session/HiveSessionImpl.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -678,11 +678,15 @@ private void cleanupPipeoutFile() {
678678
File[] fileAry = new File(lScratchDir).listFiles(
679679
(dir, name) -> name.startsWith(sessionID) && name.endsWith(".pipeout"));
680680

681-
for (File file : fileAry) {
682-
try {
683-
FileUtils.forceDelete(file);
684-
} catch (Exception e) {
685-
LOG.error("Failed to cleanup pipeout file: " + file, e);
681+
if (fileAry == null) {
682+
LOG.error("Unable to access pipeout files in " + lScratchDir);
683+
} else {
684+
for (File file : fileAry) {
685+
try {
686+
FileUtils.forceDelete(file);
687+
} catch (Exception e) {
688+
LOG.error("Failed to cleanup pipeout file: " + file, e);
689+
}
686690
}
687691
}
688692
}

sql/hive-thriftserver/v2.3/src/main/java/org/apache/hive/service/cli/session/HiveSessionImpl.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -692,11 +692,15 @@ private void cleanupPipeoutFile() {
692692
File[] fileAry = new File(lScratchDir).listFiles(
693693
(dir, name) -> name.startsWith(sessionID) && name.endsWith(".pipeout"));
694694

695-
for (File file : fileAry) {
696-
try {
697-
FileUtils.forceDelete(file);
698-
} catch (Exception e) {
699-
LOG.error("Failed to cleanup pipeout file: " + file, e);
695+
if (fileAry == null) {
696+
LOG.error("Unable to access pipeout files in " + lScratchDir);
697+
} else {
698+
for (File file : fileAry) {
699+
try {
700+
FileUtils.forceDelete(file);
701+
} catch (Exception e) {
702+
LOG.error("Failed to cleanup pipeout file: " + file, e);
703+
}
700704
}
701705
}
702706
}

0 commit comments

Comments
 (0)