stuff

diff --git a/src/fs/fs_test_lib_data.conf b/src/fs/fs_test_lib_data.conf
index 37851242f3446399b9195d599e527837c5fc73d6..fca127312f3c6668e16325b81fe38bc6c25c5eeb 100644 (file)
--- a/src/fs/fs_test_lib_data.conf
+++ b/src/fs/fs_test_lib_data.conf
@@ -21,7 +21,7 @@ DEFAULTSERVICES = fs
 
 [datastore]
 #DEBUG = YES
-#PREFIX = valgrind --tool=memcheck --leak-check=yes
+PREFIX = valgrind --tool=memcheck --leak-check=yes
 
 [statistics]
 PORT = 43467
@@ -43,15 +43,16 @@ HOSTNAME = localhost
 TOTAL_QUOTA_IN = 3932160
 TOTAL_QUOTA_OUT = 3932160
 #DEBUG = YES
-#PREFIX = valgrind --tool=memcheck --leak-check=yes
+PREFIX = valgrind --tool=memcheck --leak-check=yes
 #BINARY = /home/grothoff/bin/gnunet-service-core
 
 [fs]
 PORT = 43471
 HOSTNAME = localhost
 #OPTIONS = -L DEBUG
+ACTIVEMIGRATION = NO
 DEBUG = YES
-#PREFIX = valgrind --tool=memcheck --leak-check=yes
+PREFIX = valgrind --tool=memcheck --leak-check=yes
 #BINARY = /home/grothoff/bin/gnunet-service-fs
 #PREFIX = xterm -e gdb -x cmd --args 
 

diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c
index a183336ee28ac4eba95f8c607b9badb171ce047f..761d9a364c297cea8649f43756bc8cd5b93e69b3 100644 (file)
--- a/src/fs/gnunet-service-fs.c
+++ b/src/fs/gnunet-service-fs.c
@@ -44,7 +44,7 @@
 #include "gnunet-service-fs_indexing.h"
 #include "fs.h"
 
-#define DEBUG_FS GNUNET_YES
+#define DEBUG_FS GNUNET_NO
 
 /**
  * Maximum number of outgoing messages we queue per peer.
@@ -936,10 +936,12 @@ process_migration_content (void *cls,
        GNUNET_DATASTORE_get_next (dsh, GNUNET_YES);
       return;
     }
+#if DEBUG_FS
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Retrieved block `%s' of type %u for migration\n",
              GNUNET_h2s (key),
              type);
+#endif
   mb = GNUNET_malloc (sizeof (struct MigrationReadyBlock) + size);
   mb->query = *key;
   mb->expiration = expiration;
@@ -3469,7 +3471,11 @@ main_init (struct GNUNET_SCHEDULER_Handle *s,
     }
   /* FIXME: distinguish between sending and storing in options? */
   if (active_migration) 
-    consider_migration_gathering ();
+    {
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                 _("Content migration is enabled, will start to gather data\n"));
+      consider_migration_gathering ();
+    }
   GNUNET_SERVER_disconnect_notify (server, 
                                   &handle_client_disconnect,
                                   NULL);

diff --git a/src/fs/test_fs_data.conf b/src/fs/test_fs_data.conf
index 1ee233c78258d66163e30d41ee56ade3f120083a..53fc6b50011801982568c1a0cf92e3a06448194b 100644 (file)
--- a/src/fs/test_fs_data.conf
+++ b/src/fs/test_fs_data.conf
@@ -37,6 +37,7 @@ HOSTNAME = localhost
 [fs]
 PORT = 42471
 HOSTNAME = localhost
+ACTIVEMIGRATION = NO
 #DEBUG = YES
 
 [testing]

diff --git a/src/fs/test_fs_download_data.conf b/src/fs/test_fs_download_data.conf
index c5e839765bf9b5503209a7a8de1c943b2b668aa8..c154ba1b3d9e3cdc3028656e60ecebcf669169e9 100644 (file)
--- a/src/fs/test_fs_download_data.conf
+++ b/src/fs/test_fs_download_data.conf
@@ -36,6 +36,7 @@ HOSTNAME = localhost
 [fs]
 PORT = 42471
 HOSTNAME = localhost
+ACTIVEMIGRATION = NO
 #DEBUG = YES
 #PREFIX = valgrind --tool=memcheck --leak-check=yes
 #BINARY = /home/grothoff/bin/gnunet-service-fs

diff --git a/src/fs/test_fs_list_indexed_data.conf b/src/fs/test_fs_list_indexed_data.conf
index 84a03a3c0f9ecb16b3f5bc655a60419073e428b7..06317822aa2deca06e0b7b025b4c099322607cd5 100644 (file)
--- a/src/fs/test_fs_list_indexed_data.conf
+++ b/src/fs/test_fs_list_indexed_data.conf
@@ -36,6 +36,7 @@ HOSTNAME = localhost
 [fs]
 PORT = 42471
 HOSTNAME = localhost
+ACTIVEMIGRATION = NO
 # DEBUG = YES
 
 [testing]

diff --git a/src/fs/test_fs_publish_data.conf b/src/fs/test_fs_publish_data.conf
index d6952c4d467735e4371d496ba210fcad9b20b34d..124f925b1be719b11b013b8ffa6f2fabbbd0241a 100644 (file)
--- a/src/fs/test_fs_publish_data.conf
+++ b/src/fs/test_fs_publish_data.conf
@@ -36,6 +36,7 @@ HOSTNAME = localhost
 [fs]
 PORT = 42471
 HOSTNAME = localhost
+ACTIVEMIGRATION = NO
 #DEBUG = YES
 
 [testing]