Changeset 695

Timestamp:

01/09/07 04:13:06 (3 years ago)

Author:

hachi

Message:

r23649@lj: lj | 2007-01-08 19:10:16 -0800
Switch all logic for calculating device weights to be in Worker/Query, and make the test work again

Location:

trunk/server

Files:

• lib/MogileFS/Worker/Query.pm (modified) (2 diffs)
• t/10-weighting.t (modified) (4 diffs)

trunk/server/lib/MogileFS/Worker/Query.pm

@@ -109 +109 @@
                     return $self->err_line("dup");
                 } else {
+                    warn "Error: $@\n";
                     error("Error running command '$cmd': $@");
                     return $self->err_line("failure");
@@ -824 +825 @@
     };
 
+    my @devices_with_weights;
+
     # is this fid still owned by this key?
-    my @devids = $fid->devids;
+    foreach my $devid ($fid->devids) {
+        my $weight;
+        my $dev = $dmap->{$devid};
+
+        if (defined(my $util = $dev->observed_utilization)) {
+            $weight = 102 - $util;
+            $weight ||= 100;
+        } else {
+            $weight = $dev->weight;
+            $weight ||= 100;
+        }
+        push @devices_with_weights, [$devid, $weight];
+    }
 
     # randomly weight the devices
-    my @list = MogileFS::Util::weighted_list(map { [ $_, defined $dmap->{$_}->weight ?
-                                                     $dmap->{$_}->weight : 100 ] } @devids);
+    my @list = MogileFS::Util::weighted_list(@devices_with_weights);
 
     # keep one partially-bogus path around just in case we have nothing else to send.

trunk/server/t/10-weighting.t

@@ -13 +13 @@
     $ENV{PERL5LIB} = "$Bin/../../api/perl/lib" . ($ENV{PERL5LIB} ? ":$ENV{PERL5LIB}" : "");
     $ENV{TESTING} = 1;
-    $ENV{T_FAKE_IOW_DEV1} = 5;
-    $ENV{T_FAKE_IOW_DEV2} = 90;
+    $ENV{T_FAKE_IO_DEV1} = 95; # Simulating high device load (should get fewer requests).
+    $ENV{T_FAKE_IO_DEV2} = 5;  # Simulating low device load (shoudld get more requests).
 }
 use MogileFS::Client;
@@ -71 +71 @@
 # test some basic commands to backend
 ok($tmptrack->mogadm("domain", "add", "testdom"), "created test domain");
-ok($tmptrack->mogadm("class", "add", "testdom", "2copies", "--mindevcount=2"), "created 4copies class in testdom");
+ok($tmptrack->mogadm("class", "add", "testdom", "2copies", "--mindevcount=2"), "created 2copies class in testdom");
 
 ok($tmptrack->mogadm("host", "add", "hostA", "--ip=127.0.1.1", "--status=alive"), "created hostA");
@@ -77 +77 @@
 
 ok($tmptrack->mogadm("device", "add", "hostA", 1), "created dev1 on hostA");
-ok($tmptrack->mogadm("device", "add", "hostB", 2), "created dev4 on hostB");
+ok($tmptrack->mogadm("device", "add", "hostB", 2), "created dev2 on hostB");
 
 # wait for monitor
@@ -116 +116 @@
 }
 
-ok($stats{1} < 10, "Device 1 should get roughly 5% of traffic, got: $stats{1}");
-ok($stats{2} > 80, "Device 2 should get roughly 90% of traffic, got: $stats{2}");
+ok($stats{1} < 15, "Device 1 should get roughly 5% of traffic, got: $stats{1}");
+ok($stats{2} > 80, "Device 2 should get roughly 95% of traffic, got: $stats{2}");