diff --git a/src/volser/vsprocs.c b/src/volser/vsprocs.c index 28436157a3..8044ed7fe0 100644 --- a/src/volser/vsprocs.c +++ b/src/volser/vsprocs.c @@ -1886,6 +1886,9 @@ UV_MoveVolume2(afs_uint32 afromvol, afs_uint32 afromserver, afs_int32 afrompart, code = DoVolDelete(fromconn, newVol, afrompart, "cloned", 0, NULL, NULL); if (code) { + if (code == VNOVOL) { + EPRINT1(code, "Failed to start transaction on %u\n", newVol); + } error = code; goto mfail; } @@ -2048,9 +2051,13 @@ UV_MoveVolume2(afs_uint32 afromvol, afs_uint32 afromserver, afs_int32 afrompart, fflush(STDOUT); } - if (volid && toconn) + if (volid && toconn) { code = DoVolDelete(toconn, volid, atopart, "destination", 0, NULL, "Recovery:"); + if (code == VNOVOL) { + EPRINT1(code, "Recovery: Failed to start transaction on %u\n", volid); + } + } /* put source volume on-line */ if (fromconn) { @@ -2091,10 +2098,16 @@ UV_MoveVolume2(afs_uint32 afromvol, afs_uint32 afromserver, afs_int32 afrompart, if (fromconn) { code = DoVolDelete(fromconn, backupId, afrompart, "backup", 0, NULL, "Recovery:"); + if (code == VNOVOL) { + EPRINT1(code, "Recovery: Failed to start transaction on %u\n", backupId); + } code = DoVolDelete(fromconn, afromvol, afrompart, "source", (atoserver != afromserver)?atoserver:0, NULL, NULL); + if (code == VNOVOL) { + EPRINT1(code, "Failed to start transaction on %u\n", afromvol); + } } } @@ -2102,6 +2115,9 @@ UV_MoveVolume2(afs_uint32 afromvol, afs_uint32 afromserver, afs_int32 afrompart, if (newVol) { code = DoVolDelete(fromconn, newVol, afrompart, "clone", 0, NULL, "Recovery:"); + if (code == VNOVOL) { + EPRINT1(code, "Recovery: Failed to start transaction on %u\n", newVol); + } } /* unlock VLDB entry */ @@ -2480,6 +2496,9 @@ cpincr: code = DoVolDelete(fromconn, cloneVol, afrompart, "cloned", 0, NULL, NULL); if (code) { + if (code == VNOVOL) { + EPRINT1(code, "Failed to start transaction on %u\n", cloneVol); + } error = code; goto mfail; } @@ -2605,9 +2624,13 @@ cpincr: MapHostToNetwork(&entry); /* common cleanup - delete local clone */ - if (cloneVol) + if (cloneVol) { code = DoVolDelete(fromconn, cloneVol, afrompart, "clone", 0, NULL, "Recovery:"); + if (code == VNOVOL) { + EPRINT1(code, "Recovery: Failed to start transaction on %u\n", cloneVol); + } + } done: /* routine cleanup */ if (fromconn) @@ -7181,6 +7204,9 @@ UV_VolumeZap(afs_uint32 server, afs_int32 part, afs_uint32 volid) aconn = UV_Bind(server, AFSCONF_VOLUMEPORT); error = DoVolDelete(aconn, volid, part, "the", 0, NULL, NULL); + if (error == VNOVOL) { + EPRINT1(error, "Failed to start transaction on %u\n", volid); + } PrintError("", error); if (aconn)