- /* We are not doing a Restore or Verify */
- } else if (jcr->store->NumConcurrentJobs == 0 &&
- jcr->store->NumConcurrentJobs < jcr->store->MaxConcurrentJobs) {
- /* Simple case, first job */
- jcr->store->NumConcurrentJobs = 1;
- } else if (jcr->store->NumConcurrentJobs < jcr->store->MaxConcurrentJobs) {
- jcr->store->NumConcurrentJobs++;
- } else {
- skip_this_jcr = true;
+ }
+
+ if (jcr->wstore) {
+ Dmsg1(200, "Wstore=%s\n", jcr->wstore->name());
+ if (jcr->rstore == jcr->wstore) { /* deadlock */
+ jcr->rstore->NumConcurrentJobs--; /* back out rstore */
+ Jmsg(jcr, M_FATAL, 0, _("Job canceled. Attempt to read and write same device.\n"
+ " Read storage \"%s\" (From %s) -- Write storage \"%s\" (From %s)\n"),
+ jcr->rstore->name(), jcr->rstore_source, jcr->wstore->name(), jcr->wstore_source);
+ set_jcr_job_status(jcr, JS_Canceled);
+ return false;
+ }
+ if (jcr->wstore->NumConcurrentJobs == 0 &&
+ jcr->wstore->NumConcurrentJobs < jcr->wstore->MaxConcurrentJobs) {
+ /* Simple case, first job */
+ jcr->wstore->NumConcurrentJobs = 1;
+ Dmsg0(200, "Set wncj=1\n");
+ } else if (jcr->wstore->NumConcurrentJobs < jcr->wstore->MaxConcurrentJobs) {
+ jcr->wstore->NumConcurrentJobs++;
+ Dmsg1(200, "Inc wncj=%d\n", jcr->wstore->NumConcurrentJobs);
+ } else if (jcr->rstore) {
+ jcr->rstore->NumConcurrentJobs--; /* back out rstore */
+ Dmsg1(200, "Fail wncj=%d\n", jcr->wstore->NumConcurrentJobs);
+ skip_this_jcr = true;
+ } else {
+ Dmsg1(200, "Fail wncj=%d\n", jcr->wstore->NumConcurrentJobs);
+ skip_this_jcr = true;
+ }