Github user afine commented on a diff in the pull request:
https://github.com/apache/zookeeper/pull/144#discussion_r96526559
--- Diff:
src/java/main/org/apache/zookeeper/server/persistence/FileTxnSnapLog.java ---
@@ -135,8 +135,22 @@ public File getSnapDir() {
*/
public long restore(DataTree dt, Map<Long, Integer> sessions,
PlayBackListener listener) throws IOException {
- snapLog.deserialize(dt, sessions);
+ long deserializeResult = snapLog.deserialize(dt, sessions);
FileTxnLog txnLog = new FileTxnLog(dataDir);
+ if (-1L == deserializeResult) {
+ /* this means that we couldn't find any snapshot, so we need to
+ * initialize an empty database (reported in ZOOKEEPER-2325) */
+ if (txnLog.getLastLoggedZxid() != -1) {
--- End diff --
would it be worth adding the -1 case to the javadoc for deserialize?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
