Changeset 765

Timestamp:

03/09/07 02:27:03 (2 years ago)

Author:

hachi

Message:

iostat on linux doesn't output stats per-partition, only per device, so we try to upgrade partitions to real devices for matching when we detect them.

Files:

• branches/filepaths-20070306/server/mogstored (modified) (2 diffs)

branches/filepaths-20070306/server/mogstored

@@ -392 +392 @@
-            }
-            next unless $init;
-$
+ \n
-                my ($devnode, $util) = ("/dev/$1", $2);
-                unless (exists $dev_sysid->{$devnode}) {
@@ -434 +434 @@
-        $map->{$mogdevid} = $osdevid;
-    }
+
+    if (lc($^O) eq 'linux') {
+        my %name_to_number;
+        my %number_to_name;
+
+        if (open my $partitions, '<', '/proc/partitions') {
+            <$partitions>; <$partitions>; # First two lines are for humans
+            while (my $line = <$partitions>) {
+                my ($major, $minor, undef, $devname) = split /\s+/, $line;
+                my $devno = ($major << 8) + $minor;
+                $name_to_number{$devname} = $devno;
+                $number_to_name{$devno} = $devname;
+            }
+        } else {
+            warn "Unable to open /proc/partitions: $!";
+        }
+
+        foreach my $mogdevid (keys %$map) {
+            my $original = $map->{$mogdevid};
+            my $devname = $number_to_name{$original} or next;
+            if (my ($new) = $devname =~ m/^([hs]d\w)\d+$/) {
+                next unless $name_to_number{$new};
+                $map->{$mogdevid} = $name_to_number{$new};
+            }
+        }
+    }
-    return $map;
-}