Changeset 9422

Timestamp:

07/31/12 11:07:59 (10 months ago)

Author:

batkinson

Message:

Added gossip_debug to non-critical errors.

Files:

• branches/next0/src/common/sidcache/sidcache.c (modified) (20 diffs)

branches/next0/src/common/sidcache/sidcache.c

@@ -6 +6 @@
 
 #include "sidcache.h"
+#include "pvfs2-debug.h"
 #include "gossip.h"
-#include "pvfs2-debug.h"
 
 /* Length of string representation of uuid_t */
@@ -213 +213 @@
         if(j == SID_NUM_ATTR)
         {
-            gossip_err("Attribute: %s is an invalid attribute, and it will not be added\n", attrs_strings[i]);
+            gossip_debug(GOSSIP_SIDCACHE_DEBUG, "Attribute: %s is an invalid attribute, \
+                         and it will not be added\n", attrs_strings[i]);
             attr_positions[i] = -1;
             valid_attrs_in_file--;
@@ -300 +301 @@
         /* Getting the sid's uuid string representation from the input file */
         fscanf(inpfile, "%s", tmp_sid_str);
-        //uuid_clear(current_sid);
+
         ret = uuid_parse(tmp_sid_str, current_sid);
         if(ret)
         {
-            gossip_err("Error parsing uuid in SID_load_cache_from_file function\n");
+            /* Skips adding sid to sid cache */
+            goto bad_sid;
         }
 
@@ -323 +325 @@
 
         SID_clean_up_SID_cacheval_t(&current_sid_cacheval);
+
+        bad_sid:
+            gossip_debug(GOSSIP_SIDCACHE_DEBUG, "Error parsing uuid in SID_load_cache_from_file function\n");
     }
    
@@ -405 +410 @@
     if(ret)
     {
-        gossip_err("Error getting sid from sid cache : %s\n", db_strerror(ret));
+        gossip_debug(GOSSIP_SIDCACHE_DEBUG, "Error getting sid from sid cache : %s\n", db_strerror(ret));
         return(ret);
     }
@@ -435 +440 @@
     if (ret)
     {
-        gossip_err("Error retrieving from sid cache\n");
+        gossip_debug(GOSSIP_SIDCACHE_DEBUG, "Error retrieving from sid cache\n");
         return ret;
     }
@@ -494 +499 @@
     if(new_attrs == NULL)
     {
-        gossip_err("The new attributes passed to SID_update_sid_in_sid_cache is NULL\n");
+        gossip_debug(GOSSIP_SIDCACHE_DEBUG, "The new attributes passed to SID_update_sid_in_sid_cache is NULL\n");
         return(-1);
     }
@@ -678 +683 @@
     if(!new_url)
     {
-        gossip_err("The url passed into SID_update_url_in_sid function is currently NULL\n");
+        gossip_debug(GOSSIP_SIDCACHE_DEBUG, "The url passed into SID_update_url_in_sid function is currently NULL\n");
         return(-1);
     }
@@ -791 +796 @@
     if(ret)
     {
-        gossip_err("Error deleting record from sid cache : %s\n", db_strerror(ret));
+        gossip_debug(GOSSIP_SIDCACHE_DEBUG, "Error deleting record from sid cache : %s\n", db_strerror(ret));
         return(ret);
     }
@@ -991 +996 @@
     if(ret)
     {
-        gossip_err("Error occurred when closing cursor in SID_dump_sid_cache function: %s\n", db_strerror(ret));
+        gossip_debug(GOSSIP_SIDCACHE_DEBUG, "Error occurred when closing cursor in SID_dump_sid_cache function: %s\n", db_strerror(ret));
         return(ret);
     }
@@ -1024 +1029 @@
     if (BULK_MIN_SIZE > (size_of_retrieve_kb * KILOBYTE) + (size_of_retrieve_mb * MEGABYTE))
     {
-        gossip_err("Size of bulk retrieve buffer must be greater than 8 KB\n");
+        gossip_debug(GOSSIP_SIDCACHE_DEBUG, "Size of bulk retrieve buffer must be greater than 8 KB\n");
         return (-1);
     }
@@ -1041 +1046 @@
     if (output->data == NULL)
     {
-        gossip_err("Error sizing buffer\n");
+        gossip_debug(GOSSIP_SIDCACHE_DEBUG, "Error sizing buffer\n");
         return (-1);
     }
@@ -1051 +1056 @@
     if ((ret = dbp->cursor(dbp, NULL, dbcursorp, DB_CURSOR_BULK)) != 0) {
         free(output->data);
-        gossip_err("Error creating bulk cursor\n");
+        gossip_debug(GOSSIP_SIDCACHE_DEBUG, "Error creating bulk cursor\n");
         return (ret);
     }
@@ -1112 +1117 @@
         if (opaque_p == NULL)
         {
-            gossip_err("Error cannot fit into write buffer\n");
+            gossip_debug(GOSSIP_SIDCACHE_DEBUG, "Error cannot fit into write buffer\n");
             break;
         }
@@ -1162 +1167 @@
 {
     int ret = 0;
-
-    /* Setting the global bulk next key to zero */
-    SID_zero_dbt(&bulk_next_key, NULL, NULL);
 
     /* Setting the opening environement flags */
@@ -1224 +1226 @@
     u_int32_t flags = DB_CREATE; /* Database open flags. Creates the database if
                                     it does not already exist */
+
+    /* Setting the global bulk next key to zero */
+    SID_zero_dbt(&bulk_next_key, NULL, NULL);
 
     ret = db_create(dbp,   /* Primary database pointer */
@@ -1402 +1407 @@
             if(ret)
             {
-                gossip_err("Error closing cursor :  %s\n", db_strerror(ret));
+                gossip_debug(GOSSIP_SIDCACHE_DEBUG, "Error closing cursor :  %s\n", db_strerror(ret));
                 return(ret);
             }
@@ -1436 +1441 @@
             if(ret)
             {
-                gossip_err("Error closing attribute database : %s\n", db_strerror(ret));
+                gossip_debug(GOSSIP_SIDCACHE_DEBUG, "Error closing attribute database : %s\n", db_strerror(ret));
                 return(ret);
             }
@@ -1452 +1457 @@
      if(ret)
     {
-        gossip_err("Error closing primary database : %s\n", db_strerror(ret));
+        gossip_debug(GOSSIP_SIDCACHE_DEBUG, "Error closing primary database : %s\n", db_strerror(ret));
         return(ret);
     }
@@ -1466 +1471 @@
     if(ret)
     {
-        gossip_err("Error closing environment :  %s\n", db_strerror(ret));
+        gossip_debug(GOSSIP_SIDCACHE_DEBUG, "Error closing environment :  %s\n", db_strerror(ret));
         return(ret);
     }