1 Index: src/dird/next_vol.c
2 ===================================================================
3 --- src/dird/next_vol.c (revision 7929)
4 +++ src/dird/next_vol.c (working copy)
8 Dmsg0(150, "Call prune_volumes\n");
9 - ok = prune_volumes(jcr, InChanger, mr);
10 + prune_volumes(jcr, InChanger, mr);
13 - ok = recycle_oldest_purged_volume(jcr, InChanger, mr);
14 - if (!ok && create) {
15 - Dmsg4(050, "after prune volumes_vol ok=%d index=%d InChanger=%d Vstat=%s\n",
16 - ok, index, InChanger, mr->VolStatus);
18 - * 5. Try pulling a volume from the Scratch pool
20 - ok = get_scratch_volume(jcr, InChanger, mr);
21 - Dmsg4(050, "after get scratch volume ok=%d index=%d InChanger=%d Vstat=%s\n",
22 - ok, index, InChanger, mr->VolStatus);
25 - * If we are using an Autochanger and have not found
26 - * a volume, retry looking for any volume.
28 - if (!ok && InChanger) {
30 - continue; /* retry again accepting any volume */
34 + ok = recycle_oldest_purged_volume(jcr, InChanger, mr);
35 + if (!ok && create) {
36 + Dmsg4(050, "after prune volumes_vol ok=%d index=%d InChanger=%d Vstat=%s\n",
37 + ok, index, InChanger, mr->VolStatus);
39 + * 5. Try pulling a volume from the Scratch pool
41 + ok = get_scratch_volume(jcr, InChanger, mr);
42 + Dmsg4(050, "after get scratch volume ok=%d index=%d InChanger=%d Vstat=%s\n",
43 + ok, index, InChanger, mr->VolStatus);
46 + * If we are using an Autochanger and have not found
47 + * a volume, retry looking for any volume.
49 + if (!ok && InChanger) {
51 + continue; /* retry again accepting any volume */
59 * 6. Try "creating" a new Volume
60 Index: src/dird/autoprune.c
61 ===================================================================
62 --- src/dird/autoprune.c (revision 7929)
63 +++ src/dird/autoprune.c (working copy)
68 + * Continue if this volume is not usable
70 + if (ok && !lmr.Recycle) {
75 * If purged and not moved to another Pool,
76 * then we stop pruning and take this volume.