Return-Path: X-Original-To: apmail-zookeeper-commits-archive@www.apache.org Delivered-To: apmail-zookeeper-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A45209CB6 for ; Mon, 6 Feb 2012 08:45:14 +0000 (UTC) Received: (qmail 22166 invoked by uid 500); 6 Feb 2012 08:45:14 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 21828 invoked by uid 500); 6 Feb 2012 08:44:55 -0000 Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 21564 invoked by uid 99); 6 Feb 2012 08:44:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Feb 2012 08:44:48 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Feb 2012 08:44:45 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 74FE623888FD for ; Mon, 6 Feb 2012 08:44:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1240922 - in /zookeeper/branches/branch-3.4: ./ src/java/main/org/apache/zookeeper/server/persistence/ src/java/main/org/apache/zookeeper/server/quorum/ Date: Mon, 06 Feb 2012 08:44:25 -0000 To: commits@zookeeper.apache.org From: mahadev@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120206084425.74FE623888FD@eris.apache.org> Author: mahadev Date: Mon Feb 6 08:44:24 2012 New Revision: 1240922 URL: http://svn.apache.org/viewvc?rev=1240922&view=rev Log: ZOOKEEPER-1322. Cleanup/fix logging in Quorum code. (phunt via mahadev) Modified: zookeeper/branches/branch-3.4/CHANGES.txt zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/persistence/FileTxnLog.java zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/persistence/FileTxnSnapLog.java zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/quorum/FastLeaderElection.java zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/quorum/Leader.java zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java Modified: zookeeper/branches/branch-3.4/CHANGES.txt URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/CHANGES.txt?rev=1240922&r1=1240921&r2=1240922&view=diff ============================================================================== --- zookeeper/branches/branch-3.4/CHANGES.txt (original) +++ zookeeper/branches/branch-3.4/CHANGES.txt Mon Feb 6 08:44:24 2012 @@ -29,6 +29,10 @@ BUGFIXES: ZOOKEEPER-1373. Hardcoded SASL login context name clashes with Hadoop security configuration override. (Eugene Koontz and Thomas Weise via mahadev) +IMPROVEMENTS: + + ZOOKEEPER-1322. Cleanup/fix logging in Quorum code. (phunt via mahadev) + Release 3.4.2 - 2011-12-21 Backward compatible changes: Modified: zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/persistence/FileTxnLog.java URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/persistence/FileTxnLog.java?rev=1240922&r1=1240921&r2=1240922&view=diff ============================================================================== --- zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/persistence/FileTxnLog.java (original) +++ zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/persistence/FileTxnLog.java Mon Feb 6 08:44:24 2012 @@ -19,7 +19,6 @@ package org.apache.zookeeper.server.pers import java.io.BufferedInputStream; import java.io.BufferedOutputStream; -import java.io.ByteArrayInputStream; import java.io.EOFException; import java.io.File; import java.io.FileInputStream; @@ -41,10 +40,10 @@ import org.apache.jute.BinaryOutputArchi import org.apache.jute.InputArchive; import org.apache.jute.OutputArchive; import org.apache.jute.Record; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.apache.zookeeper.server.util.SerializeUtils; import org.apache.zookeeper.txn.TxnHeader; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This class implements the TxnLog interface. It provides api's @@ -602,8 +601,9 @@ public class FileTxnLog implements TxnLo long crcValue = ia.readLong("crcvalue"); byte[] bytes = Util.readTxnBytes(ia); // Since we preallocate, we define EOF to be an - if (bytes == null || bytes.length==0) - throw new EOFException("Failed to read"); + if (bytes == null || bytes.length==0) { + throw new EOFException("Failed to read " + logFile); + } // EOF or corrupted record // validate CRC Checksum crc = makeChecksumAlgorithm(); @@ -621,7 +621,7 @@ public class FileTxnLog implements TxnLo ia = null; hdr = null; // this means that the file has ended - // we shoud go to the next file + // we should go to the next file if (!goToNextLog()) { return false; } Modified: zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/persistence/FileTxnSnapLog.java URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/persistence/FileTxnSnapLog.java?rev=1240922&r1=1240921&r2=1240922&view=diff ============================================================================== --- zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/persistence/FileTxnSnapLog.java (original) +++ zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/persistence/FileTxnSnapLog.java Mon Feb 6 08:44:24 2012 @@ -175,7 +175,7 @@ public class FileTxnSnapLog { ((CreateSessionTxn) txn).getTimeOut()); if (LOG.isTraceEnabled()) { ZooTrace.logTraceMessage(LOG,ZooTrace.SESSION_TRACE_MASK, - "playLog --- create session in log: " + "playLog --- create session in log: 0x" + Long.toHexString(hdr.getClientId()) + " with timeout: " + ((CreateSessionTxn) txn).getTimeOut()); @@ -187,7 +187,7 @@ public class FileTxnSnapLog { sessions.remove(hdr.getClientId()); if (LOG.isTraceEnabled()) { ZooTrace.logTraceMessage(LOG,ZooTrace.SESSION_TRACE_MASK, - "playLog --- close session in log: " + "playLog --- close session in log: 0x" + Long.toHexString(hdr.getClientId())); } rc = dt.processTxn(hdr, txn); @@ -234,10 +234,10 @@ public class FileTxnSnapLog { ConcurrentHashMap sessionsWithTimeouts) throws IOException { long lastZxid = dataTree.lastProcessedZxid; - LOG.info("Snapshotting: " + Long.toHexString(lastZxid)); - File snapshot=new File( - snapDir, Util.makeSnapshotName(lastZxid)); - snapLog.serialize(dataTree, sessionsWithTimeouts, snapshot); + File snapshotFile = new File(snapDir, Util.makeSnapshotName(lastZxid)); + LOG.info("Snapshotting: 0x{} to {}", Long.toHexString(lastZxid), + snapshotFile); + snapLog.serialize(dataTree, sessionsWithTimeouts, snapshotFile); } Modified: zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/quorum/FastLeaderElection.java URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/quorum/FastLeaderElection.java?rev=1240922&r1=1240921&r2=1240922&view=diff ============================================================================== --- zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/quorum/FastLeaderElection.java (original) +++ zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/quorum/FastLeaderElection.java Mon Feb 6 08:44:24 2012 @@ -27,14 +27,14 @@ import java.util.Map; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.apache.zookeeper.jmx.MBeanRegistry; import org.apache.zookeeper.server.quorum.QuorumCnxManager.Message; import org.apache.zookeeper.server.quorum.QuorumPeer.LearnerType; import org.apache.zookeeper.server.quorum.QuorumPeer.QuorumServer; import org.apache.zookeeper.server.quorum.QuorumPeer.ServerState; import org.apache.zookeeper.server.util.ZxidUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** @@ -270,7 +270,7 @@ public class FastLeaderElection implemen n.peerEpoch = response.buffer.getLong(); } else { if(LOG.isInfoEnabled()){ - LOG.info("Backward compatibility mode, server id: " + n.sid); + LOG.info("Backward compatibility mode, server id=" + n.sid); } n.peerEpoch = ZxidUtils.getEpochFromZxid(n.zxid); } @@ -315,10 +315,10 @@ public class FastLeaderElection implemen if(ackstate == QuorumPeer.ServerState.LOOKING){ if(LOG.isDebugEnabled()){ LOG.debug("Sending new notification. My id = " + - self.getId() + ", Recipient = " + - response.sid + " zxid =" + - current.getZxid() + " leader=" + - current.getId()); + self.getId() + " recipient=" + + response.sid + " zxid=0x" + + Long.toHexString(current.getZxid()) + + " leader=" + current.getId()); } ToSend notmsg = new ToSend( ToSend.mType.notification, @@ -490,10 +490,10 @@ public class FastLeaderElection implemen private void leaveInstance(Vote v) { if(LOG.isDebugEnabled()){ - LOG.debug("About to leave FLE instance: Leader= " - + v.getId() + ", Zxid = " + - v.getZxid() + ", My id = " + self.getId() - + ", My state = " + self.getPeerState()); + LOG.debug("About to leave FLE instance: leader=" + + v.getId() + ", zxid=0x" + + Long.toHexString(v.getZxid()) + ", my id=" + self.getId() + + ", my state=" + self.getPeerState()); } recvqueue.clear(); } @@ -528,10 +528,10 @@ public class FastLeaderElection implemen sid, proposedEpoch); if(LOG.isDebugEnabled()){ - LOG.debug("Sending Notification: " + proposedLeader + " (n.leader), " + - proposedZxid + " (n.zxid), " + logicalclock + + LOG.debug("Sending Notification: " + proposedLeader + " (n.leader), 0x" + + Long.toHexString(proposedZxid) + " (n.zxid), 0x" + Long.toHexString(logicalclock) + " (n.round), " + sid + " (recipient), " + self.getId() + - " (myid), " + proposedEpoch + " (n.peerEpoch)"); + " (myid), 0x" + Long.toHexString(proposedEpoch) + " (n.peerEpoch)"); } sendqueue.offer(notmsg); } @@ -539,10 +539,12 @@ public class FastLeaderElection implemen private void printNotification(Notification n){ - LOG.info("Notification: " + n.leader + " (n.leader), " + n.zxid + - " (n.zxid), " + n.electionEpoch + " (n.round), " + n.state + - " (n.state), " + n.sid + " (n.sid), " + n.peerEpoch + " (n.peerEPoch), " + - self.getPeerState() + " (my state)"); + LOG.info("Notification: " + n.leader + " (n.leader), 0x" + + Long.toHexString(n.zxid) + " (n.zxid), 0x" + + Long.toHexString(n.electionEpoch) + " (n.round), " + n.state + + " (n.state), " + n.sid + " (n.sid), 0x" + + Long.toHexString(n.peerEpoch) + " (n.peerEPoch), " + + self.getPeerState() + " (my state)"); } /** @@ -553,8 +555,8 @@ public class FastLeaderElection implemen * @param zxid Last zxid observed by the issuer of this vote */ private boolean totalOrderPredicate(long newId, long newZxid, long newEpoch, long curId, long curZxid, long curEpoch) { - LOG.debug("id: " + newId + ", proposed id: " + curId + ", zxid: " + - newZxid + ", proposed zxid: " + curZxid); + LOG.debug("id: " + newId + ", proposed id: " + curId + ", zxid: 0x" + + Long.toHexString(newZxid) + ", proposed zxid: 0x" + Long.toHexString(curZxid)); if(self.getQuorumVerifier().getWeight(newId) == 0){ return false; } @@ -626,9 +628,9 @@ public class FastLeaderElection implemen synchronized void updateProposal(long leader, long zxid, long epoch){ if(LOG.isDebugEnabled()){ - LOG.debug("Updating proposal: " + leader + " (newleader), " + zxid + - " (newzxid), " + proposedLeader + " (oldleader), " + - proposedZxid + " (oldzxid)"); + LOG.debug("Updating proposal: " + leader + " (newleader), 0x" + + Long.toHexString(zxid) + " (newzxid), " + proposedLeader + + " (oldleader), 0x" + Long.toHexString(proposedZxid) + " (oldzxid)"); } proposedLeader = leader; proposedZxid = zxid; @@ -726,7 +728,7 @@ public class FastLeaderElection implemen } LOG.info("New election. My id = " + self.getId() + - ", Proposed zxid = " + proposedZxid); + ", proposed zxid=0x" + Long.toHexString(proposedZxid)); sendNotifications(); /* @@ -783,8 +785,9 @@ public class FastLeaderElection implemen sendNotifications(); } else if (n.electionEpoch < logicalclock) { if(LOG.isDebugEnabled()){ - LOG.debug("Notification election epoch is smaller than logicalclock. n.electionEpoch = " + n.electionEpoch - + ", Logical clock" + logicalclock); + LOG.debug("Notification election epoch is smaller than logicalclock. n.electionEpoch = 0x" + + Long.toHexString(n.electionEpoch) + + ", logicalclock=0x" + Long.toHexString(logicalclock)); } break; } else if (totalOrderPredicate(n.leader, n.zxid, n.peerEpoch, @@ -794,10 +797,10 @@ public class FastLeaderElection implemen } if(LOG.isDebugEnabled()){ - LOG.debug("Adding vote: From = " + n.sid + - ", Proposed leader = " + n.leader + - ", Proposed zxid = " + n.zxid + - ", Proposed election epoch = " + n.electionEpoch); + LOG.debug("Adding vote: from=" + n.sid + + ", proposed leader=" + n.leader + + ", proposed zxid=0x" + Long.toHexString(n.zxid) + + ", proposed election epoch=0x" + Long.toHexString(n.electionEpoch)); } recvset.put(n.sid, new Vote(n.leader, n.zxid, n.electionEpoch, n.peerEpoch)); Modified: zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/quorum/Leader.java URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/quorum/Leader.java?rev=1240922&r1=1240921&r2=1240922&view=diff ============================================================================== --- zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/quorum/Leader.java (original) +++ zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/quorum/Leader.java Mon Feb 6 08:44:24 2012 @@ -32,21 +32,20 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; -import java.util.Map.Entry; -import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.atomic.AtomicLong; import org.apache.jute.BinaryOutputArchive; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.apache.zookeeper.server.FinalRequestProcessor; import org.apache.zookeeper.server.Request; import org.apache.zookeeper.server.RequestProcessor; import org.apache.zookeeper.server.quorum.QuorumPeer.LearnerType; import org.apache.zookeeper.server.quorum.flexible.QuorumVerifier; import org.apache.zookeeper.server.util.ZxidUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This class has the control logic for the Leader. @@ -465,14 +464,12 @@ public class Leader { * @param followerAddr */ synchronized public void processAck(long sid, long zxid, SocketAddress followerAddr) { - boolean first = true; - if (LOG.isTraceEnabled()) { - LOG.trace("Ack zxid: 0x" + Long.toHexString(zxid)); + LOG.trace("Ack zxid: 0x{}", Long.toHexString(zxid)); for (Proposal p : outstandingProposals.values()) { long packetZxid = p.packet.getZxid(); - LOG.trace("outstanding proposal: 0x" - + Long.toHexString(packetZxid)); + LOG.trace("outstanding proposal: 0x{}", + Long.toHexString(packetZxid)); } LOG.trace("outstanding proposals all"); } @@ -485,31 +482,29 @@ public class Leader { } if (lastCommitted >= zxid) { if (LOG.isDebugEnabled()) { - LOG.debug("proposal has already been committed, pzxid:" - + lastCommitted - + " zxid: 0x" + Long.toHexString(zxid)); + LOG.debug("proposal has already been committed, pzxid: 0x{} zxid: 0x{}", + Long.toHexString(lastCommitted), Long.toHexString(zxid)); } // The proposal has already been committed return; } Proposal p = outstandingProposals.get(zxid); if (p == null) { - LOG.warn("Trying to commit future proposal: zxid 0x" - + Long.toHexString(zxid) + " from " + followerAddr); + LOG.warn("Trying to commit future proposal: zxid 0x{} from {}", + Long.toHexString(zxid), followerAddr); return; } p.ackSet.add(sid); if (LOG.isDebugEnabled()) { - LOG.debug("Count for zxid: 0x" + Long.toHexString(zxid) - + " is " + p.ackSet.size()); + LOG.debug("Count for zxid: 0x{} is {}", + Long.toHexString(zxid), p.ackSet.size()); } if (self.getQuorumVerifier().containsQuorum(p.ackSet)){ if (zxid != lastCommitted+1) { - LOG.warn("Commiting zxid 0x" + Long.toHexString(zxid) - + " from " + followerAddr + " not first!"); - LOG.warn("First is " - + (lastCommitted+1)); + LOG.warn("Commiting zxid 0x{} from {} not first!", + Long.toHexString(zxid), followerAddr); + LOG.warn("First is 0x{}", Long.toHexString(lastCommitted + 1)); } outstandingProposals.remove(zxid); if (p.request != null) { @@ -518,7 +513,7 @@ public class Leader { // We don't commit the new leader proposal if ((zxid & 0xffffffffL) != 0) { if (p.request == null) { - LOG.warn("Going to commmit null: " + p); + LOG.warn("Going to commmit null request for proposal: {}", p); } commit(zxid); inform(p); @@ -531,9 +526,8 @@ public class Leader { return; } else { lastCommitted = zxid; - if(LOG.isInfoEnabled()){ - LOG.info("Have quorum of supporters; starting up and setting last processed zxid: " + zk.getZxid()); - } + LOG.info("Have quorum of supporters; starting up and setting last processed zxid: 0x{}", + Long.toHexString(zk.getZxid())); zk.startup(); zk.getZKDatabase().setlastProcessedZxid(zk.getZxid()); } Modified: zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java?rev=1240922&r1=1240921&r2=1240922&view=diff ============================================================================== --- zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java (original) +++ zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java Mon Feb 6 08:44:24 2012 @@ -35,8 +35,6 @@ import java.util.concurrent.locks.Reentr import org.apache.jute.BinaryInputArchive; import org.apache.jute.BinaryOutputArchive; import org.apache.jute.Record; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.apache.zookeeper.KeeperException.SessionExpiredException; import org.apache.zookeeper.ZooDefs.OpCode; import org.apache.zookeeper.server.ByteBufferInputStream; @@ -47,6 +45,8 @@ import org.apache.zookeeper.server.quoru import org.apache.zookeeper.server.util.SerializeUtils; import org.apache.zookeeper.server.util.ZxidUtils; import org.apache.zookeeper.txn.TxnHeader; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * There will be an instance of this class created by the Leader for each @@ -261,8 +261,8 @@ public class LearnerHandler extends Thre this.sid = leader.followerCounter.getAndDecrement(); } - LOG.info("Follower sid: " + this.sid + " : info : " - + leader.self.quorumPeers.get(this.sid)); + LOG.info("Follower sid: " + sid + " : info : " + + leader.self.quorumPeers.get(sid)); if (qp.getType() == Leader.OBSERVERINFO) { learnerType = LearnerType.OBSERVER; @@ -316,16 +316,18 @@ public class LearnerHandler extends Thre rl.lock(); final long maxCommittedLog = leader.zk.getZKDatabase().getmaxCommittedLog(); final long minCommittedLog = leader.zk.getZKDatabase().getminCommittedLog(); - LOG.info("Synchronizing with Follower sid: " + this.sid - +" maxCommittedLog ="+Long.toHexString(maxCommittedLog) - +" minCommittedLog = "+Long.toHexString(minCommittedLog) - +" peerLastZxid = "+Long.toHexString(peerLastZxid)); + LOG.info("Synchronizing with Follower sid: " + sid + +" maxCommittedLog=0x"+Long.toHexString(maxCommittedLog) + +" minCommittedLog=0x"+Long.toHexString(minCommittedLog) + +" peerLastZxid=0x"+Long.toHexString(peerLastZxid)); LinkedList proposals = leader.zk.getZKDatabase().getCommittedLog(); if (proposals.size() != 0) { + LOG.debug("proposal size is {}", proposals.size()); if ((maxCommittedLog >= peerLastZxid) && (minCommittedLog <= peerLastZxid)) { + LOG.debug("Sending proposals to follower"); // as we look through proposals, this variable keeps track of previous // proposal Id. @@ -369,16 +371,25 @@ public class LearnerHandler extends Thre } } } else if (peerLastZxid > maxCommittedLog) { + LOG.debug("Sending TRUNC to follower zxidToSend=0x{} updates=0x{}", + Long.toHexString(maxCommittedLog), + Long.toHexString(updates)); + packetToSend = Leader.TRUNC; zxidToSend = maxCommittedLog; updates = zxidToSend; + } else { + LOG.warn("Unhandled proposal scenario"); } } else { // just let the state transfer happen + LOG.debug("proposals is empty"); } leaderLastZxid = leader.startForwarding(this, updates); if (peerLastZxid == leaderLastZxid) { + LOG.debug("Leader and follower are in sync, sending empty diff. zxid=0x{}", + Long.toHexString(leaderLastZxid)); // We are in sync so we'll do an empty diff packetToSend = Leader.DIFF; zxidToSend = leaderLastZxid; Modified: zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java?rev=1240922&r1=1240921&r2=1240922&view=diff ============================================================================== --- zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java (original) +++ zookeeper/branches/branch-3.4/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java Mon Feb 6 08:44:24 2012 @@ -31,14 +31,11 @@ import java.net.InetSocketAddress; import java.net.SocketException; import java.nio.ByteBuffer; import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.apache.zookeeper.jmx.MBeanRegistry; import org.apache.zookeeper.jmx.ZKMBeanInfo; import org.apache.zookeeper.server.ServerCnxnFactory; @@ -48,6 +45,8 @@ import org.apache.zookeeper.server.persi import org.apache.zookeeper.server.quorum.flexible.QuorumMaj; import org.apache.zookeeper.server.quorum.flexible.QuorumVerifier; import org.apache.zookeeper.server.util.ZxidUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This class manages the quorum protocol. There are three states this server @@ -426,8 +425,10 @@ public class QuorumPeer extends Thread i // pick a reasonable epoch number // this should only happen once when moving to a // new code version - LOG.info(CURRENT_EPOCH_FILENAME + " not found! Creating with a reasonable default. This should only happen when you are upgrading your installation"); currentEpoch = epochOfZxid; + LOG.info(CURRENT_EPOCH_FILENAME + + " not found! Creating with a reasonable default of {}. This should only happen when you are upgrading your installation", + currentEpoch); writeLongToFile(CURRENT_EPOCH_FILENAME, currentEpoch); } if (epochOfZxid > currentEpoch) { @@ -439,8 +440,10 @@ public class QuorumPeer extends Thread i // pick a reasonable epoch number // this should only happen once when moving to a // new code version - LOG.info(ACCEPTED_EPOCH_FILENAME + " not found! Creating with a reasonable default. This should only happen when you are upgrading your installation"); acceptedEpoch = epochOfZxid; + LOG.info(ACCEPTED_EPOCH_FILENAME + + " not found! Creating with a reasonable default of {}. This should only happen when you are upgrading your installation", + acceptedEpoch); writeLongToFile(CURRENT_EPOCH_FILENAME, acceptedEpoch); } if (acceptedEpoch < currentEpoch) {