Merge pull request #188 from ro-ket/ro-ket-issue-87

Add support for null checksum type. Fixes #87
spotify · Jan 25, 2016 · 561a013 · 561a013
2 parents f4ec5cb + 5eec5d2
commit 561a013
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/snakebite/channel.py b/snakebite/channel.py
@@ -574,7 +574,9 @@ def readBlock(self, length, pool_id, block_id, generation_stamp, offset, block_t
         checksum_type = block_op_response.readOpChecksumInfo.checksum.type
         bytes_per_chunk = block_op_response.readOpChecksumInfo.checksum.bytesPerChecksum
         log.debug("Checksum type: %s, bytesPerChecksum: %s" % (checksum_type, bytes_per_chunk))
-        if checksum_type in [self.CHECKSUM_CRC32C, self.CHECKSUM_CRC32]:
+        if checksum_type in [self.CHECKSUM_NULL]:
+            checksum_len = 0
+        elif checksum_type in [self.CHECKSUM_CRC32C, self.CHECKSUM_CRC32]:
             checksum_len = 4
         else:
             raise Exception("Checksum type %s not implemented" % checksum_type)
@@ -606,7 +608,7 @@ def readBlock(self, length, pool_id, block_id, generation_stamp, offset, block_t
                 byte_stream.reset()
 
                 # Collect checksums
-                if check_crc:
+                if check_crc and checksum_type != self.CHECKSUM_NULL:
                     checksums = []
                     for _ in xrange(0, chunks_per_packet):
                         checksum = self._read_bytes(checksum_len)
@@ -627,7 +629,7 @@ def readBlock(self, length, pool_id, block_id, generation_stamp, offset, block_t
                         log.debug("Reading chunk %s in load %s:", j, i)
                         bytes_to_read = min(bytes_per_chunk, data_len - read_on_packet)
                         chunk = self._read_bytes(bytes_to_read)
-                        if check_crc:
+                        if check_crc and checksum_type != self.CHECKSUM_NULL:
                             checksum_index = i * chunks_per_load + j
                             if checksum_index < len(checksums) and crc(chunk) != checksums[checksum_index]:
                                 raise Exception("Checksum doesn't match")