Changeset 8937

Timestamp:

07/12/11 15:09:48 (23 months ago)

Author:

bligon

Message:

Updated 3-way logic to use new UUID functions.

Files:

• branches/orange-next/src/server/create-immutable-copies.sm (modified) (25 diffs)

branches/orange-next/src/server/create-immutable-copies.sm

@@ -24 +24 @@
 
 /*all bits turned on*/
-static uint64_t UINT64_HIGH = 0xffffffffffffffffULL; 
+//static uint64_t UINT64_HIGH = 0xffffffffffffffffULL; 
+static const uuid_t UUID_INIT;
+PVFS_handle_generate(UUID_INIT);
 
 /*attribute keys used for the mirroring process*/
@@ -228 +230 @@
    }
 
-   gossip_debug(GOSSIP_MIRROR_DEBUG,"\tdfile_count: %d\tmetadata_handle: %llu"
+   memset(PVFS_handle_string,0,PVFS_HANDLE_STRING_LENGTH);
+   PVFS_handle_unparse(imm_p->metadata_handle,PVFS_handle_string);
+   gossip_debug(GOSSIP_MIRROR_DEBUG,"\tdfile_count: %d\tmetadata_handle: %s"
                                     "\tfs_id: %u"
                                     "\tio_servers_count: %d\n"
                                    ,imm_p->dfile_count
-                                   ,llu(imm_p->metadata_handle)
+                                   ,PVFS_handle_string
                                    ,imm_p->fs_id
                                    ,imm_p->io_servers_count );
@@ -583 +587 @@
          goto error_exit;
       }
+      memset(PVFS_handle_string,0,PVFS_HANDLE_STRING_LENGTH);
+      PVFS_handle_unparse(imm_p->handle_array_base[i],PVFS_handle_string);
       gossip_debug(GOSSIP_MIRROR_DEBUG,"\tValue of server_name is %s "
-                                       "for handle %llu\n"
+                                       "for handle %s\n"
                                       ,imm_p->io_servers[i]
-                                      ,llu(imm_p->handle_array_base[i]));
+                                      ,PVFS_handle_string);
    }/*end for*/
 
@@ -633 +639 @@
 
             imm_p->handle_array_base_local_count++;
-            gossip_debug(GOSSIP_MIRROR_DEBUG,"\tlocal source handle(%d):%llu\n"
+            PVFS_handle_unparse(imm_p->handle_array_base_local[imm_p->handle_array_base_local_count
+                               ,PVFS_handle_string);
+            gossip_debug(GOSSIP_MIRROR_DEBUG,"\tlocal source handle(%d):%s\n"
               ,imm_p->handle_array_base_local_count
-    ,llu(imm_p->handle_array_base_local[imm_p->handle_array_base_local_count]));
+              ,PVFS_handle_string);
          }
 
@@ -1057 +1065 @@
       return SM_ACTION_COMPLETE;
    }
-   memset(imm_p->writes_completed,UINT64_HIGH,sizeof(PVFS_handle) 
-                                            * imm_p->dfile_count
-                                            * imm_p->copies);
+   for (i=0; i<(imm_p->dfile_count * imm_p->copies); i++)
+       PVFS_handle_copy(imm_p->writes_completed[i],UUID_INIT);
+   //memset(imm_p->writes_completed,UINT64_HIGH,sizeof(PVFS_handle) 
+   //                                         * imm_p->dfile_count
+   //                                         * imm_p->copies);
 
    /*the retry count is used to monitor how many times we retry a write. */
@@ -1080 +1090 @@
    int src,row,cols,i,index,wc;
 
+   char PVFS_handle_string[PVFS_HANDLE_STRING_LEN];
+
    /*this variable helps to understand the logic better.  it is a redeclara- */
    /*tion of the one dimensional imm_p->handle_array_copies and can be ac-   */
@@ -1094 +1106 @@
    {
        for (cols=0; cols<imm_p->io_servers_required; cols++)
+       {
+        memset(PVFS_handle_string,0,PVFS_HANDLE_STRING_LEN);
+        PVFS_handle_unparse(handle_array_copies[row][cols],PVFS_handle_string);
         gossip_debug(GOSSIP_MIRROR_DEBUG,"\t\thandle_array_copies[%d][%d] : "
-                                         "%llu\n"
+                                         "%sn"
                                         ,row,cols
-                                        ,llu(handle_array_copies[row][cols]));
+                                        ,PVFS_handle_string);
+       }
    }
 
@@ -1117 +1133 @@
            /* cleanup and fix */
            /*this will capture UINT64_HIGH or handle*/
-/*
-           if (   imm_p->writes_completed[index] > 0
-                   || imm_p->writes_completed[index] == UINT64_HIGH)
+           if (     (PVFS_handle_compare(imm_p->writes_completed[index],UUID_INIT) == 0)
+                || !(PVFS_handle_is_null(imm_p->writes_completed[index])  )
+           //if (   imm_p->writes_completed[index] > 0
+           //        || imm_p->writes_completed[index] == UINT64_HIGH)
               break;
- */
        }
 
@@ -1177 +1193 @@
        index = imm_p->copies*src; /*first copy for this source*/
        
-       /* cleanup and fix
-       if (imm_p->writes_completed[index] == UINT64_HIGH)
-        */
-       if( 1 )
+       //if (imm_p->writes_completed[index] == UINT64_HIGH)
+        if ( PVFS_handle_compare(imm_p->writes_completed[index],UUID_INIT) == 0 )
        {
           /*handle_array_copies[copy,server#] is accessed as a two-dimensional*/
@@ -1201 +1215 @@
           {
               index = (imm_p->copies*row) + cols;
-              if (imm_p->writes_completed[index] > 0)
+              //if (imm_p->writes_completed[index] > 0)
+               if ( !PVFS_handle_is_null(imm_p->writes_completed[index]) )
               {
                  PVFS_handle_copy(req->u.mirror.dst_handle[i],
@@ -1216 +1231 @@
        req->u.mirror.encoding      = fs->encoding;
 
-       gossip_debug(GOSSIP_MIRROR_DEBUG,"\treq->: src:%llu\tfs_id:%d"
+       memset(PVFS_handle_string,0,PVFS_HANDLE_STRING_LEN);
+       PVFS_handle_unparse(req->u.mirror.src_handle,PVFS_handle_string);
+       gossip_debug(GOSSIP_MIRROR_DEBUG,"\treq->: src:%s\tfs_id:%d"
                                         "\tdist name:%s\tsrc server_nr:%d\n"
-                                       ,llu(req->u.mirror.src_handle)
+                                       ,PVFS_handle_string
                                        ,req->u.mirror.fs_id
                                        ,req->u.mirror.dist->dist_name
                                        ,req->u.mirror.src_server_nr );
        for (i=0; i<req->u.mirror.dst_count; i++)
-           gossip_debug(GOSSIP_MIRROR_DEBUG,"\treq->dst_handle[%d] : %llu\n"
+       {
+           memset(PVFS_handle_string,0,PVFS_HANDLE_STRING_LEN);
+           PVFS_handle_unparse(req->u.mirror.dst_handle[i],PVFS_handle_string);
+           gossip_debug(GOSSIP_MIRROR_DEBUG,"\treq->dst_handle[%d] : %s\n"
                                            ,i
-                                           ,llu(req->u.mirror.dst_handle[i]));
-
+                                           ,PVFS_handle_string);
+       }
        struct PINT_server_op *mirror_op = 
                               malloc(sizeof(struct PINT_server_op));
@@ -1293 +1313 @@
           }
 
+          memset(PVFS_handle_string,0,PVFS_HANDLE_STRING_LEN);
+          PVFS_handle_unparse(msg_p->handle,PVFS_handle_string);
           gossip_debug(GOSSIP_MIRROR_DEBUG,"\tmsg_p->req.op:%d"
                                            "\tmsg_p->fs_id:%d"
-                                           "\tmsg_p->handle:%llu\n"
+                                           "\tmsg_p->handle:%s\n"
                                            ,msg_p->req.op
                                            ,msg_p->fs_id
-                                           ,llu(msg_p->handle) );
+                                           ,PVFS_handle_string );
 
           PINT_sm_push_frame(smcb, REMOTE_SRC, mirror_op);
@@ -1321 +1343 @@
    struct PVFS_servresp_mirror *respmir   = NULL;
    struct PVFS_servreq_mirror  *reqmir    = NULL;   
+   char PVFS_handle_string[PVFS_HANDLE_STRING_LEN] = {0};
 
    gossip_debug(GOSSIP_MIRROR_DEBUG,"\tjs_p->error_code:%d\n"
@@ -1347 +1370 @@
                                        ,error_code,error_code
                                        ,remaining);
-       gossip_debug(GOSSIP_MIRROR_DEBUG,"\tresp.src_handle:%llu "
+       memset(PVFS_handle_string,0,PVFS_HANDLE_STRING_LEN);
+       PVFS_handle_unparse(respmir->src_handle,PVFS_handle_string);
+       gossip_debug(GOSSIP_MIRROR_DEBUG,"\tresp.src_handle:%s "
                                         "\tresp.src_server_nr:%d\n"
-                                   ,llu(respmir->src_handle)
-                                   ,respmir->src_server_nr );
+                                       ,PVFS_handle_string
+                                       ,respmir->src_server_nr );
        for (i=0; i<respmir->dst_count; i++)
        {
@@ -1404 +1429 @@
                && respmir->write_status_code[i] == 0)
            {
-                /* cleanup and fix
-               imm_p->writes_completed[index] = 0;
-                 */
-               assert(0);
+               //imm_p->writes_completed[index] = 0;
+               PVFS_handle_clear(imm_p->writes_completed[index]);
            } else if (error_code == 0)
            {
@@ -1414 +1437 @@
            } else
            {
-                /* cleanup and fix 
-               imm_p->writes_completed[index] = UINT64_HIGH;
-                 */
-               assert(0);
+               //imm_p->writes_completed[index] = UINT64_HIGH;
+               PVFS_handle_copy(imm_p->writes_completed[index],UUID_INIT);
            } 
        }
@@ -1468 +1489 @@
      {
        index = (imm_p->dfile_count * i) + j;
-       gossip_debug(GOSSIP_MIRROR_DEBUG,"\t\t[%d][%d]:%llu\n"
+       char PVFS_handle_string[PVFS_HANDLE_STRING_LEN];
+       uuid_unparse(imm_p->writes_completed[index],PVFS_handle_string);
+       gossip_debug(GOSSIP_MIRROR_DEBUG,"\t\t[%d][%d]:%s\n"
                                        ,i,j
-                                       ,llu(imm_p->writes_completed[index]));
+                                       ,PVFS_handle_string);
+       //gossip_debug(GOSSIP_MIRROR_DEBUG,"\t\t[%d][%d]:%llu\n"
+       //                                ,i,j
+       //                                ,llu(imm_p->writes_completed[index]));
      }
    }
@@ -1498 +1524 @@
    for (i=0; i<(imm_p->dfile_count * imm_p->copies); i++)
    {
-       gossip_debug(GOSSIP_MIRROR_DEBUG,"\twrites_complete[%d]:%llu\n"
-                                       ,i,llu(imm_p->writes_completed[i]));
-       if (imm_p->writes_completed[i] != 0)
+       char PVFS_handle_string[PVFS_handle_string_len] = {0};
+       PVFS_handle_unparse(imm_p->writes_completed[i],PVFS_handle_string);
+       gossip_debug(GOSSIP_MIRROR_DEBUG,"\twrites_complete[%d]:%s\n"
+                                       ,i,PVFS_handle_string);
+       //if (imm_p->writes_completed[i] != 0)
+        if ( !PVFS_handle_is_null(imm_p->writes_completed[i]) )
        {
           js_p->error_code = RETRY;
@@ -1599 +1628 @@
                                    ,sm_p->key_a[i].buffer_sz);
    PVFS_handle *myHandle = (PVFS_handle *)sm_p->val_a[i].buffer;
+   char PVFS_handle_string[PVFS_HANDLE_STRING_LEN];
    for (j=0; j<(imm_p->dfile_count*imm_p->copies); j++)
    {
-       gossip_debug(GOSSIP_MIRROR_DEBUG,"\t\thandle(%d):%llu\n"
+       memset(PVFS_handle_string,0,PVFS_HANDLE_STRING_LEN);
+       PVFS_handle_unparse(myHandle[j],PVFS_handle_string);
+       gossip_debug(GOSSIP_MIRROR_DEBUG,"\t\thandle(%d):%s\n"
        ,j
-       ,llu(myHandle[j]));
+       ,PVFS_handle_string);
    }
 
@@ -1620 +1652 @@
    for (j=0; j<(imm_p->dfile_count * imm_p->copies); j++)
    {
-       gossip_debug(GOSSIP_MIRROR_DEBUG,"\thandle(%d):status(%llu)\n"
+       memset(PVFS_handle_string,0,PVFS_HANDLE_STRING_LEN);
+       PVFS_handle_unparse(myStatus[j],PVFS_handle_string);
+       gossip_debug(GOSSIP_MIRROR_DEBUG,"\thandle(%d):status(%s)\n"
                                        ,j
-                                       ,llu(myStatus[j]));
+                                       ,PVFS_handle_string);
    }
 
@@ -1649 +1683 @@
    {
        PVFS_handle *myHandle = (PVFS_handle *)sm_p->val_a[i].buffer;
-       gossip_debug(GOSSIP_MIRROR_DEBUG,"\t\thandle(%d):%llu\n"
+       memset(PVFS_handle_string,0,PVFS_HANDLE_STRING_LEN);
+       PVFS_handle_unparse(myHandle[j],PVFS_handle_string);
+       gossip_debug(GOSSIP_MIRROR_DEBUG,"\t\thandle(%d):%s\n"
        ,j
-       ,llu(myHandle[j]));
+       ,PVFS_handle_string);
    }
 
@@ -1701 +1737 @@
    if (js_p->error_code)
    {
+      memset(PVFS_handle_string,0,PVFS_HANDLE_STRING_LENGTH);
+      PVFS_handle_unparse(imm_p->metadata_handle);
       gossip_err("Unable to store datahandles and number of copies for this "
                  "mirror operation.\n");
-      gossip_err("\tMeta data handle is %llu\n",llu(imm_p->metadata_handle));
+      gossip_err("\tMeta data handle is %s\n",PVFS_handle_string);
       return SM_ACTION_COMPLETE;
    }
@@ -1926 +1964 @@
       return(resp_p->status);
 
-   gossip_debug(GOSSIP_MIRROR_DEBUG,"\tresp->src_handle:%llu "
+   memset(PVFS_handle_string,0,PVFS_HANDLE_STRING_LEN);
+   PVFS_handle_unparse(resp_p->u.mirror.src_handle,PVFS_handle_string);
+   gossip_debug(GOSSIP_MIRROR_DEBUG,"\tresp->src_handle:%s "
                                     "\tresp->src_server_nr:%d "
                                     "\tresp->status:%d\n"
-                                   ,llu(resp_p->u.mirror.src_handle)
+                                   ,PVFS_handle_string
                                    ,resp_p->u.mirror.src_server_nr
                                    ,resp_p->status );
@@ -2006 +2046 @@
    for (i=0; i<(in_cols*rows); i++)
    {
-       gossip_debug(GOSSIP_MIRROR_DEBUG,"\thandle_array_copies(%d):%llu\n"
+       memset(PVFS_handle_string,0,PVFS_HANDLE_STRING_LEN);
+       PVFS_unparse(copies_in[i],PVFS_handle_string);
+       gossip_debug(GOSSIP_MIRROR_DEBUG,"\thandle_array_copies(%d):%s\n"
                                        ,(int)i
-                                       ,llu(copies_in[i]));
+                                       ,PVFS_handle_string);
    }
 
@@ -2028 +2070 @@
        for (j=0; j<out_cols; j++)
        {
-           gossip_debug(GOSSIP_MIRROR_DEBUG,"\t\t(%d,%d):%llu\n"
+           memset(PVFS_handle_string,0,PVFS_HANDLE_STRING_LENGTH);
+           PVFS_handle_unparse(copies_out[(i*out_cols)+j],PVFS_handle_string);
+           gossip_debug(GOSSIP_MIRROR_DEBUG,"\t\t(%d,%d):%s\n"
                                 ,(int)i,(int)j
-                                ,llu(copies_out[(i*out_cols)+j]));
+                                ,PVFS_handle_string);
        }
    }