stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8196743: jstatd doesn't see new Java processes inside Docker container

Browse Source 
Reviewed-by: sspitsyn, ysuenaga
This commit is contained in:
Kevin Walls 2021-05-07 15:43:09 +00:00
parent c6aa8f19ac
commit 0790e6016e
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalVmManager.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2004, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -45,7 +45,6 @@ import java.io.*;
*/ */
public class LocalVmManager { public class LocalVmManager {
private String userName; // user name for monitored jvm private String userName; // user name for monitored jvm
private List<String> tmpdirs;
private Pattern userPattern; private Pattern userPattern;
private Matcher userMatcher; private Matcher userMatcher;
private FilenameFilter userFilter; private FilenameFilter userFilter;
@ -77,9 +76,7 @@ public class LocalVmManager {
public LocalVmManager(String user) { public LocalVmManager(String user) {
this.userName = user; this.userName = user;
if (userName == null) { if (userName == null) {
tmpdirs = PerfDataFile.getTempDirectories(null, 0);
userPattern = Pattern.compile(PerfDataFile.userDirNamePattern); userPattern = Pattern.compile(PerfDataFile.userDirNamePattern);
userMatcher = userPattern.matcher(""); userMatcher = userPattern.matcher("");
@ -89,8 +86,6 @@ public class LocalVmManager {
return userMatcher.lookingAt(); return userMatcher.lookingAt();
} }
}; };
} else {
tmpdirs = PerfDataFile.getTempDirectories(userName, 0);
} }
filePattern = Pattern.compile(PerfDataFile.fileNamePattern); filePattern = Pattern.compile(PerfDataFile.fileNamePattern);
@ -134,6 +129,7 @@ public class LocalVmManager {
* we'd see strange file names being matched by the matcher. * we'd see strange file names being matched by the matcher.
*/ */
Set<Integer> jvmSet = new HashSet<Integer>(); Set<Integer> jvmSet = new HashSet<Integer>();
List<String> tmpdirs = PerfDataFile.getTempDirectories(userName, 0);
for (String dir : tmpdirs) { for (String dir : tmpdirs) {
File tmpdir = new File(dir); File tmpdir = new File(dir);