From b89729752ded12c9709a1d3e7ec59002afca5f9b Mon Sep 17 00:00:00 2001
From: Derrick Brashear <shadow@dementia.org>
Date: Mon, 18 Oct 2004 06:23:13 +0000
Subject: [PATCH] STABLE12-vos-new-repsite-cleanup-20040601

FIXES 4730

if for some reason we got into a situation where all ROs were marked NEW_REPSITE
 in the vldb, vos release without -f deals very poorly. force a -f, and also, ne
ver print "Old Release" for the RW, to avoid confusion


(cherry picked from commit 07ba4620cf956d1cecd5bcd4448179b681c1cc3b)
---
 src/volser/vsprocs.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/volser/vsprocs.c b/src/volser/vsprocs.c
index e50b19849..2a9b51739 100644
--- a/src/volser/vsprocs.c
+++ b/src/volser/vsprocs.c
@@ -352,6 +352,8 @@ struct nvldbentry *entry;
 	   if (entry->serverFlags[i] & NEW_REPSITE)
 	      fprintf(STDOUT," -- New release");
 	   else
+	       if (!(entry->serverFlags[i] & ITSRWVOL))
+                   fprintf(STDOUT," -- Old release");
 	      fprintf(STDOUT," -- Old release");
 	} else {
 	   if (entry->serverFlags[i] & RO_DONTUSE)
@@ -2008,11 +2010,13 @@ UV_ReleaseVolume(afromvol, afromserver, afrompart, forceflag)
   }
 
   /* Will we be completing a previously unfinished release. -force overrides */
-  for (fullrelease=1, i=0; (fullrelease && (i<entry.nServers)); i++) {
-     if (entry.serverFlags[i] & NEW_REPSITE)
-        fullrelease = 0;
+  for (s = 0, m = 0, fullrelease=0, i=0; (i<entry.nServers); i++) {
+      if (entry.serverFlags[i] & ITSROVOL) {
+	  m++;
+	  if (entry.serverFlags[i] & NEW_REPSITE) s++;
+      }
   }
-  if (forceflag && !fullrelease)
+  if ((forceflag && !fullrelease) || (s == m) || (s == 0))
     fullrelease = 1;
 
   /* Determine which volume id to use and see if it exists */
-- 
2.39.5