Protect sticky uids from garbage collection.

1 files changed, 4 insertions, 1 deletions

diff --git a/rainbow/bin/rainbow-gc b/rainbow/bin/rainbow-gc
index 24f2063..2ab493c 100755
--- a/rainbow/bin/rainbow-gc
+++ b/rainbow/bin/rainbow-gc
@@ -17,6 +17,9 @@ def active_uid(uid):
         return ret == 0
     raise CalledProcessError(ret, cmd)
 
+def sticky_uid(spool, uid):
+    return exists(join(spool, "sticky_uids", uid))
+
 def gc_uid(spool, uid):
     """This function conservatively attempts to garbage-collect stale uid
     reservations.
@@ -35,7 +38,7 @@ def gc_uid(spool, uid):
     uid_num = int(uid)
     assert uid_num >= 1000 and uid_num <= 65534  # XXX: magic numbers from util/spool.py
 
-    if active_uid(uid):
+    if active_uid(uid) or sticky_uid(spool, uid):
         return
 
     for table in ('uid_to_instance_dir', 'uid_to_home_dir', 'uid_to_gid'):