[accumulo] branch master updated: Fixed a bug that caused WAL readers to potentially use the wrong cipher suite (#568)

[ng...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ngf pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/master by this push:
     new b509ffa  Fixed a bug that caused WAL readers to potentially use the wrong cipher suite (#568)
b509ffa is described below

commit b509ffacffb1167d1ad3732b95e39b2b1eaebfdb
Author: Nick Felts <31...@users.noreply.github.com>
AuthorDate: Thu Jul 19 16:50:38 2018 -0400

    Fixed a bug that caused WAL readers to potentially use the wrong cipher suite (#568)
---
 .../tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
index b19b2c2..d3d2d5d 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
@@ -494,6 +494,7 @@ public class DfsLogger implements Comparable<DfsLogger> {
           && !params.getAllOptions().get(Property.CRYPTO_WAL_CIPHER_SUITE.getKey()).equals("")) {
         params
             .setCipherSuite(params.getAllOptions().get(Property.CRYPTO_WAL_CIPHER_SUITE.getKey()));
+        params.getAllOptions().put(Property.CRYPTO_CIPHER_SUITE.getKey(), params.getCipherSuite());
       }
 
       NoFlushOutputStream nfos = new NoFlushOutputStream(logFile);