[GitHub] [accumulo] keith-turner commented on a change in pull request #1127: fixes #1111 support reading unencrypted WALs from 1.9

[GitBox <gi...@apache.org>]

keith-turner commented on a change in pull request #1127: fixes #1111 support reading unencrypted WALs from 1.9
URL: https://github.com/apache/accumulo/pull/1127#discussion_r278166780
 
 

 ##########
 File path: server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
 ##########
 @@ -375,10 +380,19 @@ public static DFSLoggerInputStreams readHeaderAndReturnStream(FSDataInputStream
         log.debug("Using {} for decrypting WAL", cryptoService.getClass().getSimpleName());
         decryptingInput = cryptoService instanceof NoCryptoService ? input
             : new DataInputStream(decrypter.decryptStream(input));
-      } else {
-        log.error("Unsupported WAL version.");
-        input.seek(0);
+      } else if (Arrays.equals(magicBuffer, magic3)) {
+        // Read logs files from Accumulo 1.9
+        String cryptoModuleClassname = input.readUTF();
+        if (!cryptoModuleClassname.equals("NullCryptoModule")) {
+          throw new IllegalArgumentException(
+              "Old encryption modules not supported at this time.  Unsupported module : "
+                  + cryptoModuleClassname);
+        }
+
         decryptingInput = input;
+      } else {
+        throw new IllegalArgumentException(
 
 Review comment:
   Good catch.  I am going to change it to catch EOFException, which seems like the right thing to do.  The change could cause it fail in some cases where it used to succeed.  However the current code could succeed when it should fail.

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services