Skip to content

Commit

Permalink
JENKINS-46132 - Download actual proc info from the Linux agents
Browse files Browse the repository at this point in the history 
FileContent which was using Master's files for all the agents is
replaced with FilePathContent which loads actual info via remoting.
  • Loading branch information
@duemir
duemir committed Dec 18, 2017
1 parent fc4d195 commit a1b81f2
Show file tree
Hide file tree
Showing 3 changed files with 72 additions and 40 deletions.
52 changes: 34 additions & 18 deletions src/main/java/com/cloudbees/jenkins/support/impl/JVMProcessSystemMetricsContents.java
View file
Expand Up @@ -3,37 +3,53 @@
import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;

import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Logger;

/**
* System metrics of the JVM process. Only supports Unix.
*/
@Extension
public class JVMProcessSystemMetricsContents extends ProcFilesRetriever {
public abstract class JVMProcessSystemMetricsContents extends ProcFilesRetriever {
@Extension
public static class Master extends JVMProcessSystemMetricsContents {
@Override
@NonNull
public String getDisplayName() {
return "Master JVM process system metrics (Linux only)";
}
}

@Extension
public static class Agents extends JVMProcessSystemMetricsContents {
@Override
@NonNull
public String getDisplayName() {
return "Agent JVM process system metrics (Linux only)";
}

@Override
public boolean isSelectedByDefault() {
return false;
}
}

private static final Logger LOGGER = Logger.getLogger(JVMProcessSystemMetricsContents.class.getName());
static final Map<String, String> UNIX_PROC_CONTENTS;

static final Map<String,String> UNIX_PROC_CONTENTS;
static {
UNIX_PROC_CONTENTS = new HashMap<String,String>();
UNIX_PROC_CONTENTS.put("/proc/meminfo", "meminfo.txt");
UNIX_PROC_CONTENTS.put("/proc/self/status", "self/status.txt");
UNIX_PROC_CONTENTS.put("/proc/self/cmdline", "self/cmdline");
UNIX_PROC_CONTENTS.put("/proc/self/environ", "self/environ");
UNIX_PROC_CONTENTS.put("/proc/self/limits", "self/limits.txt");
UNIX_PROC_CONTENTS.put("/proc/self/mountstats", "self/mountstats.txt");
Map<String, String> contents = new HashMap<String, String>();
contents.put("/proc/meminfo", "meminfo.txt");
contents.put("/proc/self/status", "self/status.txt");
contents.put("/proc/self/cmdline", "self/cmdline");
contents.put("/proc/self/environ", "self/environ");
contents.put("/proc/self/limits", "self/limits.txt");
contents.put("/proc/self/mountstats", "self/mountstats.txt");
UNIX_PROC_CONTENTS = Collections.unmodifiableMap(contents);
}


@Override
public Map<String, String> getFilesToRetrieve() {
return UNIX_PROC_CONTENTS;
}

@Override
@NonNull
public String getDisplayName() {
return "JVM process system metrics (Linux only)";
}
}
13 changes: 6 additions & 7 deletions src/main/java/com/cloudbees/jenkins/support/impl/ProcFilesRetriever.java
View file
Expand Up @@ -3,17 +3,16 @@
import com.cloudbees.jenkins.support.AsyncResultCache;
import com.cloudbees.jenkins.support.api.Component;
import com.cloudbees.jenkins.support.api.Container;
import com.cloudbees.jenkins.support.api.FileContent;
import com.cloudbees.jenkins.support.api.FilePathContent;
import com.cloudbees.jenkins.support.util.Helper;
import com.cloudbees.jenkins.support.util.SystemPlatform;
import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.FilePath;
import hudson.model.Computer;
import hudson.model.Node;
import hudson.security.Permission;
import hudson.slaves.SlaveComputer;
import jenkins.model.Jenkins;

import java.io.File;
import java.io.IOException;
import java.util.Collections;
import java.util.Map;
Expand Down Expand Up @@ -65,11 +64,11 @@ public void addContents(@NonNull Container container) {

protected void addUnixContents(@NonNull Container container, final @NonNull Node node) {
Computer c = node.toComputer();
if (c == null) {
if (c == null || c.isOffline()) {
return;
}
// fast path bailout for Windows
if (c instanceof SlaveComputer && !Boolean.TRUE.equals(((SlaveComputer) c).isUnix())) {
if (!Boolean.TRUE.equals(c.isUnix())) {
return;
}
SystemPlatform nodeSystemPlatform = getSystemPlatform(node);
Expand All @@ -84,8 +83,8 @@ protected void addUnixContents(@NonNull Container container, final @NonNull Node
}

for (Map.Entry<String, String> procDescriptor : getFilesToRetrieve().entrySet()) {
container.add(new FileContent("nodes/" + name + "/proc/" + procDescriptor.getValue(),
new File(procDescriptor.getKey())));
container.add(new FilePathContent("nodes/" + name + "/proc/" + procDescriptor.getValue(),
new FilePath(c.getChannel(), procDescriptor.getKey())));
}

afterAddUnixContents(container, node, name);
Expand Down
47 changes: 32 additions & 15 deletions src/main/java/com/cloudbees/jenkins/support/impl/SystemConfiguration.java
View file
Expand Up @@ -37,6 +37,7 @@

import java.io.File;
import java.io.IOException;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.WeakHashMap;
Expand All @@ -47,8 +48,29 @@
* System configuration data (CPU information, swap configuration, mount points,
* kernel messages and entropy)
*/
@Extension
public class SystemConfiguration extends ProcFilesRetriever {
public abstract class SystemConfiguration extends ProcFilesRetriever {
@Extension
public static class Master extends SystemConfiguration {
@Override
@NonNull
public String getDisplayName() {
return "Master system configuration (Linux only)";
}
}

@Extension
public static class Agents extends SystemConfiguration {
@Override
@NonNull
public String getDisplayName() {
return "Agent system configuration (Linux only)";
}

@Override
public boolean isSelectedByDefault() {
return false;
}
}

private final WeakHashMap<Node,String> sysCtlCache = new WeakHashMap<Node, String>();

Expand All @@ -60,26 +82,21 @@ public class SystemConfiguration extends ProcFilesRetriever {
private static final Map<String,String> UNIX_PROC_CONTENTS;

static {
UNIX_PROC_CONTENTS = new HashMap<String,String>();
UNIX_PROC_CONTENTS.put("/proc/swaps", "swaps.txt");
UNIX_PROC_CONTENTS.put("/proc/cpuinfo", "cpuinfo.txt");
UNIX_PROC_CONTENTS.put("/proc/mounts", "mounts.txt");
UNIX_PROC_CONTENTS.put("/proc/uptime", "system-uptime.txt");
UNIX_PROC_CONTENTS.put("/proc/net/rpc/nfs", "net/rpc/nfs.txt");
UNIX_PROC_CONTENTS.put("/proc/net/rpc/nfsd", "net/rpc/nfsd.txt");
Map<String, String> contents = new HashMap<String,String>();
contents.put("/proc/swaps", "swaps.txt");
contents.put("/proc/cpuinfo", "cpuinfo.txt");
contents.put("/proc/mounts", "mounts.txt");
contents.put("/proc/uptime", "system-uptime.txt");
contents.put("/proc/net/rpc/nfs", "net/rpc/nfs.txt");
contents.put("/proc/net/rpc/nfsd", "net/rpc/nfsd.txt");
UNIX_PROC_CONTENTS = Collections.unmodifiableMap(contents);
}

@Override
public Map<String, String> getFilesToRetrieve() {
return UNIX_PROC_CONTENTS;
}

@Override
@NonNull
public String getDisplayName() {
return "System configuration (Linux only)";
}

@Override
protected void afterAddUnixContents(@NonNull Container container, final @NonNull Node node, String name) {
container.add(
Expand Down

0 comments on commit a1b81f2

Please sign in to comment.