Author: schultz Date: Wed Jan 21 15:13:18 2015 New Revision: 1653552 URL: http://svn.apache.org/r1653552 Log: Back-port r1653550 to fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57473 Add more logging to WarWatcher, specifically checking for odd states like non-existent files that were just listed by the filesystem, which suggests a permissions problem. Moved log strings into LocalStrings.properties
Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jan 21 15:13:18 2015 @@ -1 +1 @@ -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471 +/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892 ,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550 Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties?rev=1653552&r1=1653551&r2=1653552&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/deploy/LocalStrings.properties Wed Jan 21 15:13:18 2015 @@ -45,3 +45,9 @@ farmWarDeployer.stopped=Cluster FarmWarD farmWarDeployer.undeployEnd=Undeployment from [{0}] finished. farmWarDeployer.undeployLocal=Undeploy local context [{0}] farmWarDeployer.watchDir=Cluster deployment is watching [{0}] for changes. + +warWatcher.checking-wars=Checking WARs in {0} +warWatcher.listed-file-does-not-exist={0} was detected in {1} but does not exist. Check directory permissions on {1}? +warWatcher.checking-war=Checking WAR file {0} +warWatcher.check-war.result=WarInfo.check() returned {0} for {1} +warWatcher.cant-list-watchDir=Cannot list files in WatchDir "{0}": check to see if it is a directory and has read permissions. Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java?rev=1653552&r1=1653551&r2=1653552&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java (original) +++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java Wed Jan 21 15:13:18 2015 @@ -23,6 +23,7 @@ import java.util.Map; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; +import org.apache.tomcat.util.res.StringManager; /** * The <b>WarWatcher </b> watches the deployDir for changes made to the @@ -36,6 +37,8 @@ public class WarWatcher { /*--Static Variables----------------------------------------*/ private static final Log log = LogFactory.getLog(WarWatcher.class); + private static final StringManager sm = + StringManager.getManager(Constants.Package); /*--Instance Variables--------------------------------------*/ /** @@ -67,20 +70,31 @@ public class WarWatcher { */ public void check() { if (log.isDebugEnabled()) - log.debug("check cluster wars at " + watchDir); + log.debug(sm.getString("warWatcher.checking-wars", watchDir)); File[] list = watchDir.listFiles(new WarFilter()); - if (list == null) + if (list == null) { + log.warn(sm.getString("warWatcher.cant-list-watchDir", + watchDir)); + list = new File[0]; + } //first make sure all the files are listed in our current status for (int i = 0; i < list.length; i++) { + if(!list[i].exists()) + log.warn(sm.getString("warWatcher.listed-file-does-not-exist", + list[i], watchDir)); + addWarInfo(list[i]); } - //check all the status codes and update the FarmDeployer + // Check all the status codes and update the FarmDeployer for (Iterator<Map.Entry<String,WarInfo>> i = currentStatus.entrySet().iterator(); i.hasNext();) { Map.Entry<String,WarInfo> entry = i.next(); WarInfo info = entry.getValue(); + if(log.isTraceEnabled()) + log.trace(sm.getString("warWatcher.checking-war", + info.getWar())); int check = info.check(); if (check == 1) { listener.fileModified(info.getWar()); @@ -89,6 +103,10 @@ public class WarWatcher { //no need to keep in memory i.remove(); } + if(log.isTraceEnabled()) + log.trace(sm.getString("warWatcher.check-war.result", + Integer.valueOf(check), + info.getWar())); } } Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1653552&r1=1653551&r2=1653552&view=diff ============================================================================== --- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Wed Jan 21 15:13:18 2015 @@ -74,6 +74,10 @@ in a manner that makes it look like the <code>JAVA_HOME</code> environment variable. (markt) </fix> + <fix> + <bug>57473</bug>: Add sanity check to FarmWebDeployer's WarWatcher to + detect suspected incorrect permissions on the watch directory. (schultz) + </fix> </changelog> </subsection> <subsection name="Cluster"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org