The Unified and Autonomous Development Platform
Fix issue #827 - Failure on platforms without JNA support
Robin Shenf06f73c109e2
diff --git a/pom.xml b/pom.xmlindex 9aa8465ad1..df59ab60c8 100644--- a/pom.xml+++ b/pom.xml@@ -589,7 +589,7 @@</repositories><properties><commons.version>2.2.4</commons.version>- <agent.version>1.3.17</agent.version>+ <agent.version>1.3.18</agent.version><slf4j.version>1.7.30</slf4j.version><logback.version>1.2.9</logback.version><antlr.version>4.7.2</antlr.version>diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.javaindex 5aa6d56084..6a8edd038b 100644--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java@@ -2796,11 +2796,16 @@ public class DataMigrator {if (key.equals("SYSTEM")) {Element valueElement = element.element("value");if (valueElement != null) {- HardwareAbstractionLayer hardware = new SystemInfo().getHardware();- int cpu = hardware.getProcessor().getLogicalProcessorCount()*1000;- valueElement.addElement("cpu").setText(String.valueOf(cpu));- int memory = (int) (hardware.getMemory().getTotal()/1024/1024);- valueElement.addElement("memory").setText(String.valueOf(memory));+ try {+ HardwareAbstractionLayer hardware = new SystemInfo().getHardware();+ int cpu = hardware.getProcessor().getLogicalProcessorCount()*1000;+ valueElement.addElement("cpu").setText(String.valueOf(cpu));+ int memory = (int) (hardware.getMemory().getTotal()/1024/1024);+ valueElement.addElement("memory").setText(String.valueOf(memory));+ } catch (Exception e) {+ valueElement.addElement("cpu").setText("4000");+ valueElement.addElement("memory").setText("8000");+ }}} else if (key.equals("JOB_EXECUTORS")) {Element valueElement = element.element("value");diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/PerformanceSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/PerformanceSetting.javaindex bca168ea46..411f509bed 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/PerformanceSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/PerformanceSetting.java@@ -2,6 +2,9 @@ package io.onedev.server.model.support.administration;import java.io.Serializable;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;+import io.onedev.server.web.editable.annotation.Editable;import oshi.SystemInfo;import oshi.hardware.HardwareAbstractionLayer;@@ -11,6 +14,8 @@ public class PerformanceSetting implements Serializable {private static final long serialVersionUID = 1;+ private static final Logger logger= LoggerFactory.getLogger(PerformanceSetting.class);+private int cpuIntensiveTaskConcurrency;private int serverJobExecutorCpuQuota;@@ -24,10 +29,19 @@ public class PerformanceSetting implements Serializable {private int maxCodeSearchEntries = 100;public PerformanceSetting() {- HardwareAbstractionLayer hardware = new SystemInfo().getHardware();- cpuIntensiveTaskConcurrency = hardware.getProcessor().getLogicalProcessorCount();- serverJobExecutorCpuQuota = hardware.getProcessor().getLogicalProcessorCount()*1000;- serverJobExecutorMemoryQuota = (int) (hardware.getMemory().getTotal()/1024/1024);+ try {+ HardwareAbstractionLayer hardware = new SystemInfo().getHardware();+ cpuIntensiveTaskConcurrency = hardware.getProcessor().getLogicalProcessorCount();+ serverJobExecutorCpuQuota = hardware.getProcessor().getLogicalProcessorCount()*1000;+ serverJobExecutorMemoryQuota = (int) (hardware.getMemory().getTotal()/1024/1024);+ } catch (Exception e) {+ logger.debug("Error calling oshi", e);+ logger.warn("Unable to call oshi to set default performance setting. Assume some arbitrary numbers. "+ + "You may change it later via menu 'administration / performance setting'");+ cpuIntensiveTaskConcurrency = 4;+ serverJobExecutorCpuQuota = 4000;+ serverJobExecutorMemoryQuota = 8000;+ }}@Editable(order=100, name="CPU Intensive Task Concurrency", description="Specify max concurrent CPU intensive "