*** empty log message ***

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@836 29311d96-e01e-0410-9327-a35deaab8ce9

diff --git a/ceph/osd/Ager.cc b/ceph/osd/Ager.cc
index 0bd3449653628043a432a85f4439a1dd08aebd94..2f772eb8a71f7aa79d7f204b48138f67c3324ba8 100644 (file)
--- a/ceph/osd/Ager.cc
+++ b/ceph/osd/Ager.cc
@@ -104,7 +104,7 @@ __uint64_t Ager::age_fill(float pc, utime_t until) {
   }
   delete[] buf;
 
-  return wrote;
+  return wrote*4; // KB
 }
 
 void Ager::age_empty(float pc) {
@@ -233,7 +233,7 @@ void Ager::age(int time,
   for (int c=1; c<=count; c++) {
        if (g_clock.now() > until) break;
        
-       if (c == 7) start_debug = true;
+       //if (c == 7) start_debug = true;
        
        dout(1) << "age " << c << "/" << count << " filling to " << high_water << endl;
        __uint64_t w = age_fill(high_water, until);
@@ -244,7 +244,6 @@ void Ager::age(int time,
        //pfrag(st);
 
 
-
        if (c == count) {
          dout(1) << "age final empty to " << final_water << endl;
          age_empty(final_water);       
@@ -254,6 +253,10 @@ void Ager::age(int time,
        }
        store->sync();
        store->_get_frag_stat(st);
+
+       dout(1) << wrote / (1024ULL*1024ULL) << " GB written\t";// << endl;
+
+
        pfrag(st);
 
        // dump freelist?
@@ -264,8 +267,6 @@ void Ager::age(int time,
        }
   }
 
-  dout(1) << wrote / (1024ULL*1024ULL) << " GB written" << endl;
-
   // dump the freelist
   save_freelist(0);
   exit(0);   // hack

diff --git a/ceph/script/sum.pl b/ceph/script/sum.pl
index e6ebc9f696e17cca229e4feeafe43a9e91b34275..92ef9a9b222a83e30030a622b7fd98de7d5c6c8c 100755 (executable)
--- a/ceph/script/sum.pl
+++ b/ceph/script/sum.pl
@@ -26,11 +26,13 @@ my @files = @ARGV;
 if (scalar(@files) == 1 && $files[0] =~ /\*/) {
        my ($dir, $pat) = $files[0] =~ /^(.*)\/([^\/]+)$/;
        @files = ();
-
+       $pat =~ s/\*//;
+#      print "dir $dir pat $pat\n";
        opendir(D,"$dir");
        for my $f (readdir(D)) {
+       #       print "$f\n";
                next unless $f =~ /^$pat/;
-               push(@files, $f);
+               push(@files, "$dir/$f");
        }
        closedir(D);