From: Eric Bollengier Date: Wed, 12 May 2021 07:14:47 +0000 (+0200) Subject: Revert "Fix #7321 About issue when stopping jobs waiting for resources" X-Git-Tag: Release-11.3.2~539 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31f8ebda5dad6e162b5256d90d41bf88faded233;p=thirdparty%2Fbacula.git Revert "Fix #7321 About issue when stopping jobs waiting for resources" This reverts commit 8ad330d63a73a59af5e5e26905bf453fa5534991. --- diff --git a/bacula/src/stored/askdir.c b/bacula/src/stored/askdir.c index 165dbfbf1..1c3125092 100644 --- a/bacula/src/stored/askdir.c +++ b/bacula/src/stored/askdir.c @@ -866,16 +866,6 @@ bool dir_ask_sysop_to_create_appendable_volume(DCR *dcr) Dmsg1(dbglvl, "Poll timeout in create append vol on device %s\n", dev->print_name()); continue; } - - if (stat == W_WAKE) { - /* Job could be marked to stopped, need to break */ - Mmsg0(dev->errmsg, _("Job was stopped by the user.\n")); - Jmsg(jcr, M_FATAL, 0, "%s", dev->errmsg); - Dmsg1(dbglvl, "Job marked to be stopped. Gave up waiting on device %s\n", dev->print_name()); - dev->poll = false; - return false; - } - if (stat == W_TIMEOUT) { if (!double_dev_wait_time(dev)) { Mmsg(dev->errmsg, _("Max time exceeded waiting to mount Storage Device %s for Job %s\n"),