Repository: stratos Updated Branches: refs/heads/4.0.0-grouping 7a2dc588c -> 317858007
merging HealthStatisticsReader and CartridgeAgent Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/31785800 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/31785800 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/31785800 Branch: refs/heads/4.0.0-grouping Commit: 317858007f6fb12970db29ec5ef39bcf0ea99a81 Parents: 7a2dc58 Author: Isuru Haththotuwa <[email protected]> Authored: Thu Aug 28 17:18:03 2014 +0530 Committer: Isuru Haththotuwa <[email protected]> Committed: Thu Aug 28 17:18:03 2014 +0530 ---------------------------------------------------------------------- .../stratos/cartridge/agent/CartridgeAgent.java | 54 +-------- .../publisher/HealthStatisticsReader.java | 112 +++++++++---------- 2 files changed, 51 insertions(+), 115 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/31785800/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java index b73db36..a69aa7a 100644 --- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java +++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java @@ -154,14 +154,11 @@ public class CartridgeAgent implements Runnable { if (log.isInfoEnabled()) { log.info("No artifact repository found"); } -<<<<<<< HEAD -======= // Execute instance activated shell script extensionHandler.onInstanceActivatedEvent(); // Publish instance activated event CartridgeAgentEventPublisher.publishInstanceActivatedEvent(); ->>>>>>> master } else { //Start periodical file checker task /*if (CartridgeAgentConfiguration.getInstance().isCommitsEnabled()) { @@ -620,59 +617,10 @@ public class CartridgeAgent implements Runnable { } } -<<<<<<< HEAD - private void onArtifactUpdateEvent(ArtifactUpdatedEvent event) { - ArtifactUpdatedEvent artifactUpdatedEvent = event; - if(log.isInfoEnabled()) { - log.info(String.format("Artifact update event received: %s", artifactUpdatedEvent.toString())); - } - - String clusterIdInPayload = CartridgeAgentConfiguration.getInstance().getClusterId(); - String localRepoPath = CartridgeAgentConfiguration.getInstance().getAppPath(); - String clusterIdInMessage = artifactUpdatedEvent.getClusterId(); - String repoURL = artifactUpdatedEvent.getRepoURL(); - String repoPassword = CartridgeAgentUtils.decryptPassword(artifactUpdatedEvent.getRepoPassword()); - String repoUsername = artifactUpdatedEvent.getRepoUserName(); - String tenantId = artifactUpdatedEvent.getTenantId(); - boolean isMultitenant = CartridgeAgentConfiguration.getInstance().isMultitenant(); - - if(StringUtils.isNotEmpty(repoURL) && (clusterIdInPayload != null) && clusterIdInPayload.equals(clusterIdInMessage)) { - if(log.isInfoEnabled()) { - log.info("Executing git checkout"); - } - RepositoryInformation repoInformation = new RepositoryInformation(); - repoInformation.setRepoUsername(repoUsername); - if(repoPassword == null) { - repoInformation.setRepoPassword(""); - }else { - repoInformation.setRepoPassword(repoPassword); - } - repoInformation.setRepoUrl(repoURL); - repoInformation.setRepoPath(localRepoPath); - repoInformation.setTenantId(tenantId); - repoInformation.setMultitenant(isMultitenant); - boolean cloneExists = GitBasedArtifactRepository.getInstance().cloneExists(repoInformation); - GitBasedArtifactRepository.getInstance().checkout(repoInformation); - - ExtensionUtils.executeArtifactsUpdatedExtension(); - - if (!cloneExists && portsActivated) { - // Executed git clone, publish instance activated event - CartridgeAgentEventPublisher.publishInstanceActivatedEvent(); - } - - // Start the artifact update task - boolean artifactUpdateEnabled = Boolean.parseBoolean(System.getProperty(CartridgeAgentConstants.ENABLE_ARTIFACT_UPDATE)); - if (artifactUpdateEnabled) { - - long artifactUpdateInterval = 10; - // get update interval - String artifactUpdateIntervalStr = System.getProperty(CartridgeAgentConstants.ARTIFACT_UPDATE_INTERVAL); -======= public static ExtensionHandler getExtensionHandler() { return extensionHandler; } ->>>>>>> master + public void terminate() { terminated = true; http://git-wip-us.apache.org/repos/asf/stratos/blob/31785800/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsReader.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsReader.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsReader.java index f934d0a..87a0e5a 100644 --- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsReader.java +++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsReader.java @@ -29,44 +29,27 @@ import org.apache.stratos.cartridge.agent.util.CartridgeAgentUtils; import java.io.FileInputStream; import java.io.IOException; import java.lang.management.ManagementFactory; -<<<<<<< HEAD import java.io.IOException; -======= import java.util.Scanner; ->>>>>>> master /** * Health statistics reader. */ -public class HealthStatisticsReader implements IHealthStatisticsReader { - +public class HealthStatisticsReader { private static final int MB = 1024 * 1024; private static final Log log = LogFactory.getLog(HealthStatisticsReader.class); -<<<<<<< HEAD - public boolean init() { - return true; - } - - public CartridgeStatistics getCartridgeStatistics() throws IOException { - OperatingSystemMXBean osBean = (OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean(); - double totalMemory = (double)(osBean.getTotalPhysicalMemorySize()/ MB); - double usedMemory = (double)((totalMemory - (osBean.getFreePhysicalMemorySize() / MB) )); - double loadAvg = (double)osBean.getSystemLoadAverage(); - // assume system cores = available cores to JVM - int cores = osBean.getAvailableProcessors(); -======= public static double getMemoryConsumption() { - double totalMemory = 0, usedMemory = 0; - - if (isWindows()) { - OperatingSystemMXBean osBean = (OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean(); - totalMemory = (double)(osBean.getTotalPhysicalMemorySize()/ MB); - usedMemory = (double)((totalMemory - (osBean.getFreePhysicalMemorySize() / MB) )); - } else { - String fName = "/proc/meminfo"; - try { - FileInputStream f = new FileInputStream(fName); + double totalMemory = 0, usedMemory = 0; + + if (isWindows()) { + OperatingSystemMXBean osBean = (OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean(); + totalMemory = (double)(osBean.getTotalPhysicalMemorySize()/ MB); + usedMemory = (double)((totalMemory - (osBean.getFreePhysicalMemorySize() / MB) )); + } else { + String fName = "/proc/meminfo"; + try { + FileInputStream f = new FileInputStream(fName); /* $ cat /proc/meminfo * MemTotal: 2056964 kB @@ -74,54 +57,59 @@ public class HealthStatisticsReader implements IHealthStatisticsReader { * Buffers: 9776 kB * Cached: 127220 kB */ - Scanner scanner = new Scanner(f).useDelimiter("\\D+"); - try { - long memTotal = scanner.nextLong(); - long memFree = scanner.nextLong(); - long buffers = scanner.nextLong(); - long cached = scanner.nextLong(); - - totalMemory = memTotal; - usedMemory = memTotal - (memFree + buffers + cached); - } catch (Exception ex) { - log.error("Could not calculate memory usage.", ex); - } finally { - scanner.close(); - } - } catch (IOException ex) { - log.error("Could not calculate memory usage.", ex); - } - } - + Scanner scanner = new Scanner(f).useDelimiter("\\D+"); + try { + long memTotal = scanner.nextLong(); + long memFree = scanner.nextLong(); + long buffers = scanner.nextLong(); + long cached = scanner.nextLong(); + + totalMemory = memTotal; + usedMemory = memTotal - (memFree + buffers + cached); + } catch (Exception ex) { + log.error("Could not calculate memory usage.", ex); + } finally { + scanner.close(); + } + } catch (IOException ex) { + log.error("Could not calculate memory usage.", ex); + } + } + if(log.isDebugEnabled()) { - log.debug("Calculating memory consumption: [totalMemory] "+totalMemory+" [usedMemory] "+usedMemory); + log.debug("Calculating memory consumption: [totalMemory] "+totalMemory+" [usedMemory] "+usedMemory); } ->>>>>>> master double memoryConsumption = (usedMemory / totalMemory) * 100; - double loadAvgPercentage = (loadAvg/cores) * 100; + if(log.isDebugEnabled()) { + log.debug("Calculating memory consumption: [percentage] "+memoryConsumption); + } + return memoryConsumption; + } + + public static double getLoadAverage() { + double loadAvg = (double)ManagementFactory.getOperatingSystemMXBean().getSystemLoadAverage(); + // assume system cores = available cores to JVM + int cores = ManagementFactory.getOperatingSystemMXBean().getAvailableProcessors(); + + if(log.isDebugEnabled()) { + log.debug("Calculating load average consumption: [loadAverage] "+loadAvg+" [cores] "+cores); + } + double loadAvgPercentage = (loadAvg/cores) * 100; if(log.isDebugEnabled()) { - log.debug("Memory consumption: [totalMemory] "+totalMemory+"Mb [usedMemory] "+usedMemory+"Mb: "+memoryConsumption+"%"); - log.debug("Processor consumption: [loadAverage] "+loadAvg+" [cores] "+cores+": "+loadAvgPercentage+"%"); + log.debug("Calculating load average consumption: [percentage] "+loadAvgPercentage); } - - return (new CartridgeStatistics(memoryConsumption, loadAvgPercentage)); + return loadAvgPercentage; } public static boolean allPortsActive() { return CartridgeAgentUtils.checkPortsActive(CartridgeAgentConfiguration.getInstance().getListenAddress(), - CartridgeAgentConfiguration.getInstance().getPorts()); + CartridgeAgentConfiguration.getInstance().getPorts()); } -<<<<<<< HEAD - public void delete() { - } -} -======= - private static boolean isWindows() { String os = System.getProperty("os.name").toLowerCase(); return os.indexOf("win") >= 0; } } ->>>>>>> master +
