Changeset 767

Timestamp:

03/09/07 21:31:15 (2 years ago)

Author:

hachi

Message:

iostat on linux doesn't show per-pertitions statistics, so when we map mogile devices to os devices, we need to upgrade the partitions to their parent devices.

Files:

• trunk/server/mogstored (modified) (1 diff)

trunk/server/mogstored

@@ -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, $devname) = $line =~
+                    m/^ \s* (\d+) \s+ (\d+) \s+ \d+ \s+ (\S+) \s* $/x;
+                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;
-}