2 files changed, 16 insertions, 2 deletions

diff --git a/src/datastore/datastore.h b/src/datastore/datastore.h
index 55ca7c8e5..8fa0ca044 100644
--- a/src/datastore/datastore.h
+++ b/src/datastore/datastore.h
@@ -27,7 +27,7 @@
 #ifndef DATASTORE_H
 #define DATASTORE_H
 
-#define DEBUG_DATASTORE GNUNET_YES
+#define DEBUG_DATASTORE GNUNET_NO
 
 #include "gnunet_util_lib.h"
 
diff --git a/src/datastore/datastore_api.c b/src/datastore/datastore_api.c
index e0c184a57..58340ed6c 100644
--- a/src/datastore/datastore_api.c
+++ b/src/datastore/datastore_api.c
@@ -1090,6 +1090,13 @@ process_result_message (void *cls,
                       _("Failed to receive response from database.\n"));
           do_disconnect (h);
         }
+      else
+        {
+#if DEBUG_DATASTORE
+          GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                      "Request dropped due to finite datastore queue length.\n");
+#endif
+        }
       if (rc.iter != NULL)
         rc.iter (rc.iter_cls,
                  NULL, 0, NULL, 0, 0, 0, 
@@ -1307,7 +1314,14 @@ GNUNET_DATASTORE_get (struct GNUNET_DATASTORE_Handle *h,
                          queue_priority, max_queue_size, timeout,
                          &process_result_message, &qc);
   if (qe == NULL)
-    return NULL;
+    {
+#if DEBUG_DATASTORE
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                  "Could not queue request for `%s'\n",
+                  GNUNET_h2s (key));
+#endif
+      return NULL;
+    }
   gm = (struct GetMessage*) &qe[1];
   gm->header.type = htons(GNUNET_MESSAGE_TYPE_DATASTORE_GET);
   gm->type = htonl(type);