[GNUnet-SVN] r18614 - gnunet/src/fs

[gnunet]

Author: grothoff
Date: 2011-12-15 15:56:22 +0100 (Thu, 15 Dec 2011)
New Revision: 18614

Modified:
   gnunet/src/fs/gnunet-service-fs_cp.c
   gnunet/src/fs/gnunet-service-fs_pr.c
Log:
use better heuristic to deal with datastore put failures; log migration stop 
message transmissions

Modified: gnunet/src/fs/gnunet-service-fs_cp.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_cp.c        2011-12-15 14:55:51 UTC (rev 
18613)
+++ gnunet/src/fs/gnunet-service-fs_cp.c        2011-12-15 14:56:22 UTC (rev 
18614)
@@ -1694,6 +1694,9 @@
       GNUNET_TIME_relative_hton (GNUNET_TIME_absolute_get_remaining
                                  (cp->last_migration_block));
   memcpy (buf, &msm, sizeof (struct MigrationStopMessage));
+  GNUNET_STATISTICS_update (GSF_stats,
+                            gettext_noop ("# migration stop messages sent"),
+                            1, GNUNET_NO);
   return sizeof (struct MigrationStopMessage);
 }
 

Modified: gnunet/src/fs/gnunet-service-fs_pr.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs_pr.c        2011-12-15 14:55:51 UTC (rev 
18613)
+++ gnunet/src/fs/gnunet-service-fs_pr.c        2011-12-15 14:56:22 UTC (rev 
18614)
@@ -927,9 +927,10 @@
     }
   }
   GNUNET_free (pmc);
-  /* FIXME: should we really update the load value on failure? */
+  /* on failure, increase the put load dramatically */
   if (NULL != datastore_put_load)
-    GNUNET_LOAD_update (datastore_put_load, delay.rel_value);
+    GNUNET_LOAD_update (datastore_put_load, 
+                       GNUNET_TIME_UNIT_HOURS.rel_value);
   if (GNUNET_OK == success)
     return;
   GNUNET_STATISTICS_update (GSF_stats,