merlimat closed pull request #867: During journal replay, force to re-insert 
the master key in ledger storage
URL: https://github.com/apache/bookkeeper/pull/867
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git 
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java 
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java
index 812942d43..90b193922 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java
@@ -767,6 +767,9 @@ public void process(int journalVersion, long offset, 
ByteBuffer recBuff) throws
 
                             recBuff.get(masterKey);
                             masterKeyCache.put(ledgerId, masterKey);
+
+                            // Force to re-insert the master key in ledger 
storage
+                            handles.getHandle(ledgerId, masterKey);
                         } else {
                             throw new IOException("Invalid journal. Contains 
journalKey "
                                     + " but layout version (" + journalVersion


 

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


With regards,
Apache Git Services

Reply via email to