This includes Ted's unchecked-in changes from two years ago, as well

[moira.git] / incremental / afs_nightly.pl

diff --git a/incremental/afs_nightly.pl b/incremental/afs_nightly.pl
index 68a00211d377082bb362f2e69c9edadfe98001a9..0a3b6349feedac942acabaed8878e279e5600764 100644 (file)
--- a/incremental/afs_nightly.pl
+++ b/incremental/afs_nightly.pl
@@ -15,6 +15,15 @@ if (open(TMP,"/afs/athena.mit.edu/service/afs_data")) {
 }
 
 chop(@new_data);
+
+for (@new_data) {
+    ($c,$as,$ap) = split(/\s+/,$_);
+    ($as) = gethostbyname($as) unless ($c =~ /^\#/);
+    $c =~ tr/a-z/A-Z/;
+    $as =~ tr/a-z/A-Z/;
+    $ap =~ s:^([^/]):/vicep\1:;
+    $ok{"$c $as $ap"} = 1;
+}
 for (@new_data) {
     $as = $ap = 0;
     if ($_ !~ /^\#/) {
@@ -30,12 +39,18 @@ for (@new_data) {
     truncate(SRV, 0);
     for (@afs_data) {
        ($c2,$as2,$ap2) = split(/\s+/,$_);
+       next unless ($c2 =~ /^\#/ || $ok{"$c2 $as2 $ap2"});
        print SRV $_ unless ($c eq $c2 && $as eq $as2 && $ap eq $ap2);
     }
     &afs_unlock;
-
-    ($total, $used) = &afs_partinfo($as, $ap, $c);
+    
+    open(VOS,"$vos partinfo $as $ap -cell $c -noauth|");
+    chop(@vos = <VOS>);
+    close(VOS);
     next if ($?);
+    @vos = split(/\s+/,$vos[0]);
+    $total = pop(@vos);
+    $used = $total-$vos[5];
     $alloc = 0;
     
     open(VOS,"$vos listvol $as $ap -cell $c -long -noauth|");