Skip to content
This repository has been archived by the owner on Jul 7, 2020. It is now read-only.

Recognition when the parent directory of a task has been deleted. #28

Merged
merged 1 commit into from
Feb 14, 2014
Merged

Recognition when the parent directory of a task has been deleted. #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 14 additions & 6 deletions hydra-main/src/main/java/com/addthis/hydra/job/Minion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2101,9 +2101,13 @@ public boolean stopWait(File[] pidFiles, boolean kill) {
if (kill) {
resetStartTime();
log.warn("[stopWait] creating done files if they do not exist");
createDoneFileIfNoProcessRunning(jobPid, jobDone);
createDoneFileIfNoProcessRunning(replicatePid, replicateDone);
createDoneFileIfNoProcessRunning(backupPid, backupDone);
if (!jobDone.getParentFile().exists()) {
log.warn("The directory " + jobDone.getParent() + " does not exist.");
} else {
createDoneFileIfNoProcessRunning(jobPid, jobDone);
createDoneFileIfNoProcessRunning(replicatePid, replicateDone);
createDoneFileIfNoProcessRunning(backupPid, backupDone);
}
}
for (File pidFile : pidFiles) {
Integer pid = getPID(pidFile);
Expand Down Expand Up @@ -2545,9 +2549,13 @@ public void run() {
task.sendEndStatus(0);
} else if (stop.force()) {
log.warn("[task.stop] " + task.getName() + " force stop unmatched");
task.createDoneFileIfNoProcessRunning(task.jobPid, task.jobDone);
task.createDoneFileIfNoProcessRunning(task.replicatePid, task.replicateDone);
task.createDoneFileIfNoProcessRunning(task.backupPid, task.backupDone);
if (!task.jobDone.getParentFile().exists()) {
log.warn("The directory " + task.jobDone.getParent() + " does not exist.");
} else {
task.createDoneFileIfNoProcessRunning(task.jobPid, task.jobDone);
task.createDoneFileIfNoProcessRunning(task.replicatePid, task.replicateDone);
task.createDoneFileIfNoProcessRunning(task.backupPid, task.backupDone);
}
if (task.jobDone != null && task.jobDone.exists()) {
int endStatus = 0;
try {
Expand Down
2 changes: 1 addition & 1 deletion hydra-main/src/main/java/com/addthis/hydra/job/MinionWorkItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ public String exitWait() {
stdoutWatch = new Minion.FileWatcher(logOut, kick.getKillSignal());
stderrWatch = new Minion.FileWatcher(logErr, kick.getKillSignal());
}
while (!task.isDeleted() && !doneFile.exists()) {
while (!task.isDeleted() && !doneFile.exists() && doneFile.getParentFile().exists()) {
Thread.sleep(100);
executeWaitingCommands();
if (stdoutWatch != null && stdoutWatch.containsKill()) {
Expand Down