Bugfixes for re-calculation from testing.

Author: bbockelm

src/gridftp_hdfs_cksm.c

@@ -342,8 +342,7 @@ hdfs_calculate_checksum(hdfs_handle_t *hdfs_handle, hdfsFS fs, const char *type)
 
     GlobusGFSName(hdfs_calculate_checksum);
 
-    hdfs_parse_checksum_types(hdfs_handle, type);
-    hdfs_initialize_checksum(hdfs_handle);
+    hdfs_initialize_checksums(hdfs_handle);
 
     hdfsFile fd = hdfsOpenFile(fs, hdfs_handle->pathname, O_RDONLY, 0, 1, 0);
     if (fd == NULL) {
@@ -359,11 +358,13 @@ hdfs_calculate_checksum(hdfs_handle_t *hdfs_handle, hdfsFS fs, const char *type)
         return rc;
     }
     ssize_t retval = 0;
+    globus_off_t offset = 0;
     do {
-        hdfs_udpate_checksums(hdfs_handle, buffer, retval);
+        hdfs_update_checksums(hdfs_handle, buffer, retval);
         errno = 0;  // older versions of libhdfs sometimes fails to reset errno.
         retval = hdfsRead(fs, fd, buffer, cksum_buffer_size);
         if ((retval == -1) && (errno == EINTR)) {continue;}
+        offset += retval;
     } while (retval > 0);
     if (retval == -1) {
         SystemError(hdfs_handle, "Failed to read from file for checksumming", rc);
@@ -372,6 +373,8 @@ hdfs_calculate_checksum(hdfs_handle_t *hdfs_handle, hdfsFS fs, const char *type)
     hdfsCloseFile(fs, fd);
 
     if (rc == GLOBUS_SUCCESS) {
+        hdfs_handle->offset = offset;
+        hdfs_finalize_checksums(hdfs_handle);
         rc = hdfs_save_checksum(hdfs_handle);
     }
     return rc;
@@ -388,7 +391,7 @@ globus_result_t hdfs_get_checksum(hdfs_handle_t *hdfs_handle, const char * pathn
 
     hdfsFS fs = hdfsConnectAsUser("default", 0, "root");
     if (fs == NULL) {
-        SystemError(hdfs_handle, "Failure in connecting to HDFS for checksum upload", rc);
+        SystemError(hdfs_handle, "Failure in connecting to HDFS for checksumming.", rc);
         return rc;
     }