You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by rg...@apache.org on 2015/12/09 05:06:47 UTC
svn commit: r1718759 - in /zookeeper/branches/branch-3.5: CHANGES.txt
src/java/main/org/apache/zookeeper/Login.java
Author: rgs
Date: Wed Dec 9 04:06:47 2015
New Revision: 1718759
URL: http://svn.apache.org/viewvc?rev=1718759&view=rev
Log:
ZOOKEEPER-2295: TGT refresh time logic is wrong
(Arshad Mohammad via rgs)
Modified:
zookeeper/branches/branch-3.5/CHANGES.txt
zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/Login.java
Modified: zookeeper/branches/branch-3.5/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/CHANGES.txt?rev=1718759&r1=1718758&r2=1718759&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.5/CHANGES.txt Wed Dec 9 04:06:47 2015
@@ -83,6 +83,9 @@ BUGFIXES:
ZOOKEEPER-2299: NullPointerException in LocalPeerBean for ClientAddress
(Arshad Mohammad via rgs)
+ ZOOKEEPER-2295: TGT refresh time logic is wrong
+ (Arshad Mohammad via rgs)
+
IMPROVEMENTS:
ZOOKEEPER-2270: Allow MBeanRegistry to be overridden for better unit tests
Modified: zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/Login.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/Login.java?rev=1718759&r1=1718758&r2=1718759&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/Login.java (original)
+++ zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/Login.java Wed Dec 9 04:06:47 2015
@@ -155,7 +155,6 @@ public class Login {
if ((nextRefresh > expiry) ||
((now + MIN_TIME_BEFORE_RELOGIN) > expiry)) {
// expiry is before next scheduled refresh).
- LOG.info("refreshing now because expiry is before next scheduled refresh time.");
nextRefresh = now;
} else {
if (nextRefresh < (now + MIN_TIME_BEFORE_RELOGIN)) {
@@ -178,7 +177,9 @@ public class Login {
return;
}
}
- if (now < nextRefresh) {
+ if (now == nextRefresh) {
+ LOG.info("refreshing now because expiry is before next scheduled refresh time.");
+ } else if (now < nextRefresh) {
Date until = new Date(nextRefresh);
LOG.info("TGT refresh sleeping until: {}", until.toString());
try {
@@ -193,7 +194,7 @@ public class Login {
+ " clock sync between this host and KDC - (KDC's clock is likely ahead of this host)."
+ " Manual intervention will be required for this client to successfully authenticate."
+ " Exiting refresh thread.", nextRefreshDate);
- return;
+ break;
}
if (isUsingTicketCache) {
String cmd = "/usr/bin/kinit";