You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2018/04/08 12:22:30 UTC
[maven-surefire] branch 1512 updated (3c472ff -> 611505d)
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a change to branch 1512
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git.
discard 3c472ff [SUREFIRE-1512] ProcessInfo for Windows is prone to timezone offset changes
new 611505d [SUREFIRE-1512] ProcessInfo for Windows is prone to timezone offset changes
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (3c472ff)
\
N -- N -- N refs/heads/1512 (611505d)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/maven/surefire/booter/PpidChecker.java | 39 ++++++++++------------
1 file changed, 17 insertions(+), 22 deletions(-)
--
To stop receiving notification emails like this one, please contact
tibordigana@apache.org.
[maven-surefire] 01/01: [SUREFIRE-1512] ProcessInfo for Windows is
prone to timezone offset changes
Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch 1512
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit 611505db1dfd6b046d98ffa0340b55bb6a74a633
Author: Tibor17 <ti...@apache.org>
AuthorDate: Sun Apr 8 12:24:39 2018 +0200
[SUREFIRE-1512] ProcessInfo for Windows is prone to timezone offset changes
---
.../apache/maven/surefire/booter/PpidChecker.java | 60 +++++++++++++---------
.../apache/maven/surefire/booter/ProcessInfo.java | 2 +-
2 files changed, 37 insertions(+), 25 deletions(-)
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PpidChecker.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PpidChecker.java
index 32e3ad7..5ba0119 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PpidChecker.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PpidChecker.java
@@ -22,13 +22,15 @@ package org.apache.maven.surefire.booter;
import java.io.File;
import java.io.IOException;
import java.nio.charset.Charset;
+import java.text.SimpleDateFormat;
+import java.util.Locale;
import java.util.Queue;
import java.util.Scanner;
-import java.util.StringTokenizer;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import static java.lang.Integer.parseInt;
import static java.lang.Long.parseLong;
import static java.util.concurrent.TimeUnit.DAYS;
import static java.util.concurrent.TimeUnit.HOURS;
@@ -39,6 +41,8 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank;
import static org.apache.commons.lang3.SystemUtils.IS_OS_HP_UX;
import static org.apache.commons.lang3.SystemUtils.IS_OS_UNIX;
import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS;
+import static org.apache.maven.surefire.booter.ProcessInfo.unixProcessInfo;
+import static org.apache.maven.surefire.booter.ProcessInfo.windowsProcessInfo;
import static org.apache.maven.surefire.booter.ProcessInfo.ERR_PROCESS_INFO;
import static org.apache.maven.surefire.booter.ProcessInfo.INVALID_PROCESS_INFO;
@@ -50,6 +54,12 @@ import static org.apache.maven.surefire.booter.ProcessInfo.INVALID_PROCESS_INFO;
*/
final class PpidChecker
{
+ private static final int MINUTES_TO_MILLIS = 60 * 1000;
+ // 25 chars https://superuser.com/questions/937380/get-creation-time-of-file-in-milliseconds/937401#937401
+ private static final int WMIC_CREATION_DATE_VALUE_LENGTH = 25;
+ private static final int WMIC_CREATION_DATE_TIMESTAMP_LENGTH = 18;
+ private static final SimpleDateFormat WMIC_CREATION_DATE_FORMAT
+ = new SimpleDateFormat( "yyyyMMddHHmmss'.'SSS", Locale.ROOT );
private static final String WMIC_CREATION_DATE = "CreationDate";
private static final String WINDOWS_SYSTEM_ROOT_ENV = "SystemRoot";
private static final String RELATIVE_PATH_TO_WMIC = "System32\\Wbem";
@@ -151,7 +161,7 @@ final class PpidChecker
+ fromHours( matcher )
+ fromMinutes( matcher )
+ fromSeconds( matcher );
- return ProcessInfo.unixProcessInfo( pluginPid, pidUptime );
+ return unixProcessInfo( pluginPid, pidUptime );
}
}
return previousProcessInfo;
@@ -168,31 +178,36 @@ final class PpidChecker
private boolean hasHeader;
@Override
- ProcessInfo consumeLine( String line, ProcessInfo previousProcessInfo )
+ ProcessInfo consumeLine( String line, ProcessInfo previousProcessInfo ) throws Exception
{
- if ( !previousProcessInfo.isValid() )
+ if ( !previousProcessInfo.isValid() && !line.isEmpty() )
{
- StringTokenizer args = new StringTokenizer( line );
- if ( args.countTokens() == 1 )
+ if ( hasHeader )
{
- if ( hasHeader )
+ // now the line is CreationDate, e.g. 20180406142327.741074+120
+ if ( line.length() != WMIC_CREATION_DATE_VALUE_LENGTH )
{
- String startTimestamp = args.nextToken();
- return ProcessInfo.windowsProcessInfo( pluginPid, startTimestamp );
- }
- else
- {
- hasHeader = WMIC_CREATION_DATE.equals( args.nextToken() );
+ throw new IllegalStateException( "WMIC CreationDate should have 25 characters "
+ + line );
}
+ String startTimestamp = line.substring( 0, WMIC_CREATION_DATE_TIMESTAMP_LENGTH );
+ int indexOfTimeZone = WMIC_CREATION_DATE_VALUE_LENGTH - 4;
+ long startTimestampMillisUTC =
+ WMIC_CREATION_DATE_FORMAT.parse( startTimestamp ).getTime()
+ - parseInt( line.substring( indexOfTimeZone ) ) * MINUTES_TO_MILLIS;
+ return windowsProcessInfo( pluginPid, startTimestampMillisUTC );
+ }
+ else
+ {
+ hasHeader = WMIC_CREATION_DATE.equals( line );
}
}
return previousProcessInfo;
}
};
- String pid = String.valueOf( pluginPid );
String wmicPath = hasWmicStandardSystemPath() ? SYSTEM_PATH_TO_WMIC : "";
return reader.execute( "CMD", "/A", "/X", "/C",
- wmicPath + "wmic process where (ProcessId=" + pid + ") get " + WMIC_CREATION_DATE
+ wmicPath + "wmic process where (ProcessId=" + pluginPid + ") get " + WMIC_CREATION_DATE
);
}
@@ -210,7 +225,7 @@ final class PpidChecker
return stopped;
}
- static String unixPathToPS()
+ private static String unixPathToPS()
{
return canExecuteLocalUnixPs() ? "/usr/bin/ps" : "/bin/ps";
}
@@ -286,7 +301,7 @@ final class PpidChecker
this.charset = charset;
}
- abstract ProcessInfo consumeLine( String line, ProcessInfo previousProcessInfo );
+ abstract ProcessInfo consumeLine( String line, ProcessInfo previousProcessInfo ) throws Exception;
ProcessInfo execute( String... command )
{
@@ -312,14 +327,11 @@ final class PpidChecker
int exitCode = process.waitFor();
return exitCode == 0 ? processInfo : INVALID_PROCESS_INFO;
}
- catch ( IOException e )
+ catch ( Exception e )
{
- DumpErrorSingleton.getSingleton().dumpException( e );
- return ERR_PROCESS_INFO;
- }
- catch ( InterruptedException e )
- {
- DumpErrorSingleton.getSingleton().dumpException( e );
+ DumpErrorSingleton.getSingleton()
+ .dumpException( e );
+
return ERR_PROCESS_INFO;
}
finally
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProcessInfo.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProcessInfo.java
index 212e221..d106dd9 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProcessInfo.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProcessInfo.java
@@ -47,7 +47,7 @@ final class ProcessInfo
return new ProcessInfo( pid, etime );
}
- static ProcessInfo windowsProcessInfo( long pid, String startTimestamp )
+ static ProcessInfo windowsProcessInfo( long pid, long startTimestamp )
{
return new ProcessInfo( pid, requireNonNull( startTimestamp, "startTimestamp is NULL" ) );
}
--
To stop receiving notification emails like this one, please contact
tibordigana@apache.org.