refactor: optimize home-dal (#865)

traas-stack · Jun 18, 2024 · 3ad1bd1 · 3ad1bd1
1 parent 0fe1648
commit 3ad1bd1
Show file tree

Hide file tree

Showing 199 changed files with 748 additions and 1,030 deletions.
diff --git a/scripts/docker/bin/app.sh b/scripts/docker/bin/app.sh
@@ -44,7 +44,7 @@ fi
 
 
 # GC
-JAVA_OPTS="$JAVA_OPTS -XX:CMSInitiatingOccupancyFraction=65 -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -XX:+CMSParallelRemarkEnabled -XX:+UseCMSInitiatingOccupancyOnly -XX:+CMSScavengeBeforeRemark -XX:CMSMaxAbortablePrecleanTime=5000 -XX:CMSScheduleRemarkEdenPenetration=50 -XX:+CMSParallelInitialMarkEnabled -XX:PermSize=256m -XX:MaxPermSize=256m -XX:MetaspaceSize=256m -XX:MaxMetaspaceSize=256m -XX:+UseCMSCompactAtFullCollection -XX:CMSFullGCsBeforeCompaction=3"
+JAVA_OPTS="$JAVA_OPTS -XX:CMSInitiatingOccupancyFraction=75 -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -XX:+CMSParallelRemarkEnabled -XX:+UseCMSInitiatingOccupancyOnly -XX:+CMSScavengeBeforeRemark -XX:CMSMaxAbortablePrecleanTime=5000 -XX:CMSScheduleRemarkEdenPenetration=50 -XX:+CMSParallelInitialMarkEnabled -XX:PermSize=256m -XX:MaxPermSize=256m -XX:MetaspaceSize=256m -XX:MaxMetaspaceSize=256m -XX:+UseCMSCompactAtFullCollection -XX:CMSFullGCsBeforeCompaction=3"
 JAVA_OPTS="$JAVA_OPTS -Xloggc:/home/admin/logs/gc.log -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintAdaptiveSizePolicy -XX:+PrintTenuringDistribution -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=100m -verbose:gc -XX:+DisableExplicitGC"
 
 # other

diff --git a/...m-receiver/src/main/java/io/holoinsight/server/apm/receiver/analysis/SlowSqlAnalysis.java b/...m-receiver/src/main/java/io/holoinsight/server/apm/receiver/analysis/SlowSqlAnalysis.java
@@ -6,7 +6,7 @@
 import io.holoinsight.server.apm.common.constants.Const;
 import io.holoinsight.server.apm.common.utils.TimeUtils;
 import io.holoinsight.server.apm.engine.model.SlowSqlDO;
-import io.holoinsight.server.common.trace.TraceAgentConfiguration;
+import io.holoinsight.server.common.dao.entity.dto.TraceAgentConfigurationDTO;
 import io.holoinsight.server.common.trace.TraceAgentConfigurationScheduler;
 import io.opentelemetry.proto.trace.v1.Span;
 import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
@@ -46,10 +46,10 @@ public List<SlowSqlDO> analysis(Span span, Map<String, String> spanAttrMap,
         - TimeUtils.unixNano2MS(span.getStartTimeUnixNano());
     long slowSqlThreshold = Const.SLOW_SQL_THRESHOLD;
     // Get slow sql dynamic threshold from cache
-    TraceAgentConfiguration configuration =
+    TraceAgentConfigurationDTO configuration =
         agentConfigurationScheduler.getValue(tenant, service, getExtendInfo(spanAttrMap));
     if (configuration != null) {
-      slowSqlThreshold = Long.parseLong(configuration.getConfiguration()
+      slowSqlThreshold = Long.parseLong((String) configuration.getConfiguration()
           .getOrDefault(Const.SLOW_SQL_THRESHOLD_CONFIG, String.valueOf(slowSqlThreshold)));
     }
     if (latency < slowSqlThreshold) {

diff --git a/...e/dal/converter/DisplayMenuConverter.java → ...n/dao/converter/DisplayMenuConverter.java b/...e/dal/converter/DisplayMenuConverter.java → ...n/dao/converter/DisplayMenuConverter.java
@@ -1,11 +1,11 @@
 /*
  * Copyright 2022 Holoinsight Project Authors. Licensed under Apache-2.0.
  */
-package io.holoinsight.server.home.dal.converter;
+package io.holoinsight.server.common.dao.converter;
 
-import io.holoinsight.server.home.dal.model.DisplayMenu;
-import io.holoinsight.server.home.dal.model.dto.DisplayMenuDTO;
-import io.holoinsight.server.home.dal.transformer.DisplayMenuConfigMapper;
+import io.holoinsight.server.common.dao.entity.DisplayMenu;
+import io.holoinsight.server.common.dao.entity.dto.DisplayMenuDTO;
+import io.holoinsight.server.common.dao.transformer.DisplayMenuConfigMapper;
 import org.mapstruct.Mapper;
 
 import java.util.List;

diff --git a/...l/converter/DisplayTemplateConverter.java → ...o/converter/DisplayTemplateConverter.java b/...l/converter/DisplayTemplateConverter.java → ...o/converter/DisplayTemplateConverter.java
@@ -1,10 +1,10 @@
 /*
  * Copyright 2022 Holoinsight Project Authors. Licensed under Apache-2.0.
  */
-package io.holoinsight.server.home.dal.converter;
+package io.holoinsight.server.common.dao.converter;
 
-import io.holoinsight.server.home.dal.model.DisplayTemplate;
-import io.holoinsight.server.home.dal.model.dto.DisplayTemplateDTO;
+import io.holoinsight.server.common.dao.entity.DisplayTemplate;
+import io.holoinsight.server.common.dao.entity.dto.DisplayTemplateDTO;
 import io.holoinsight.server.common.dao.transformer.MapJsonMapper;
 import org.mapstruct.Mapper;
 

diff --git a/...verter/IntegrationGeneratedConverter.java → ...verter/IntegrationGeneratedConverter.java b/...verter/IntegrationGeneratedConverter.java → ...verter/IntegrationGeneratedConverter.java
@@ -1,10 +1,10 @@
 /*
  * Copyright 2022 Holoinsight Project Authors. Licensed under Apache-2.0.
  */
-package io.holoinsight.server.home.dal.converter;
+package io.holoinsight.server.common.dao.converter;
 
-import io.holoinsight.server.home.dal.model.IntegrationGenerated;
-import io.holoinsight.server.home.dal.model.dto.IntegrationGeneratedDTO;
+import io.holoinsight.server.common.dao.entity.IntegrationGenerated;
+import io.holoinsight.server.common.dao.entity.dto.IntegrationGeneratedDTO;
 import io.holoinsight.server.common.dao.transformer.MapJsonMapper;
 import org.mapstruct.Mapper;
 

diff --git a/...converter/IntegrationPluginConverter.java → ...converter/IntegrationPluginConverter.java b/...converter/IntegrationPluginConverter.java → ...converter/IntegrationPluginConverter.java
@@ -1,14 +1,14 @@
 /*
  * Copyright 2022 Holoinsight Project Authors. Licensed under Apache-2.0.
  */
-package io.holoinsight.server.home.dal.converter;
+package io.holoinsight.server.common.dao.converter;
 
 import io.holoinsight.server.common.J;
-import io.holoinsight.server.home.dal.model.IntegrationPlugin;
-import io.holoinsight.server.home.dal.model.dto.GaeaCollectConfigDTO.CollectRange;
-import io.holoinsight.server.home.dal.model.dto.IntegrationPluginDTO;
-import io.holoinsight.server.home.dal.transformer.GaeaCollectRangeMapper;
-import io.holoinsight.server.home.dal.transformer.JsonObjectMapper;
+import io.holoinsight.server.common.dao.entity.GaeaCollectRange;
+import io.holoinsight.server.common.dao.entity.IntegrationPlugin;
+import io.holoinsight.server.common.dao.entity.dto.IntegrationPluginDTO;
+import io.holoinsight.server.common.dao.transformer.GaeaCollectRangeMapper;
+import io.holoinsight.server.common.dao.transformer.JsonObjectMapper;
 import io.holoinsight.server.common.dao.transformer.MapJsonMapper;
 import org.apache.commons.lang3.StringUtils;
 import org.mapstruct.Mapper;
@@ -25,7 +25,7 @@ public interface IntegrationPluginConverter {
 
   List<IntegrationPluginDTO> dosToDTOs(Iterable<IntegrationPlugin> integrationPlugins);
 
-  default String map(CollectRange value) {
+  default String map(GaeaCollectRange value) {
     if (value == null) {
       return StringUtils.EMPTY;
     }

diff --git a/...onverter/IntegrationProductConverter.java → ...onverter/IntegrationProductConverter.java b/...onverter/IntegrationProductConverter.java → ...onverter/IntegrationProductConverter.java
@@ -1,19 +1,19 @@
 /*
  * Copyright 2022 Holoinsight Project Authors. Licensed under Apache-2.0.
  */
-package io.holoinsight.server.home.dal.converter;
+package io.holoinsight.server.common.dao.converter;
 
-import io.holoinsight.server.home.dal.model.IntegrationProduct;
-import io.holoinsight.server.home.dal.model.dto.IntegrationProductDTO;
-import io.holoinsight.server.home.dal.transformer.FormJsonMapper;
+import io.holoinsight.server.common.dao.entity.IntegrationProduct;
+import io.holoinsight.server.common.dao.entity.dto.IntegrationProductDTO;
+import io.holoinsight.server.common.dao.transformer.IntegrationFormJsonMapper;
 import io.holoinsight.server.common.dao.transformer.MapJsonMapper;
-import io.holoinsight.server.home.dal.transformer.MetricJsonMapper;
+import io.holoinsight.server.common.dao.transformer.MetricJsonMapper;
 import org.mapstruct.Mapper;
 
 import java.util.List;
 
 @Mapper(componentModel = "spring",
-    uses = {MetricJsonMapper.class, MapJsonMapper.class, FormJsonMapper.class})
+    uses = {MetricJsonMapper.class, MapJsonMapper.class, IntegrationFormJsonMapper.class})
 public interface IntegrationProductConverter {
 
   IntegrationProductDTO doToDTO(IntegrationProduct IntegrationProduct);

diff --git a/...converter/MarketplacePluginConverter.java → ...converter/MarketplacePluginConverter.java b/...converter/MarketplacePluginConverter.java → ...converter/MarketplacePluginConverter.java
@@ -1,15 +1,15 @@
 /*
  * Copyright 2022 Holoinsight Project Authors. Licensed under Apache-2.0.
  */
-package io.holoinsight.server.home.dal.converter;
+package io.holoinsight.server.common.dao.converter;
 
 import java.util.List;
 
+import io.holoinsight.server.common.dao.transformer.JsonObjectMapper;
 import org.mapstruct.Mapper;
 
-import io.holoinsight.server.home.dal.model.MarketplacePlugin;
-import io.holoinsight.server.home.dal.model.dto.MarketplacePluginDTO;
-import io.holoinsight.server.home.dal.transformer.JsonObjectMapper;
+import io.holoinsight.server.common.dao.entity.MarketplacePlugin;
+import io.holoinsight.server.common.dao.entity.dto.MarketplacePluginDTO;
 
 @Mapper(componentModel = "spring", uses = {JsonObjectMapper.class})
 public interface MarketplacePluginConverter {

diff --git a/...onverter/MarketplaceProductConverter.java → ...onverter/MarketplaceProductConverter.java b/...onverter/MarketplaceProductConverter.java → ...onverter/MarketplaceProductConverter.java
@@ -1,18 +1,18 @@
 /*
  * Copyright 2022 Holoinsight Project Authors. Licensed under Apache-2.0.
  */
-package io.holoinsight.server.home.dal.converter;
+package io.holoinsight.server.common.dao.converter;
 
 import java.util.List;
 
+import io.holoinsight.server.common.dao.transformer.IntegrationFormJsonMapper;
 import org.mapstruct.Mapper;
 
-import io.holoinsight.server.home.dal.model.MarketplaceProduct;
-import io.holoinsight.server.home.dal.model.dto.MarketplaceProductDTO;
-import io.holoinsight.server.home.dal.transformer.FormJsonMapper;
-import io.holoinsight.server.home.dal.transformer.MetricJsonMapper;
+import io.holoinsight.server.common.dao.entity.MarketplaceProduct;
+import io.holoinsight.server.common.dao.entity.dto.MarketplaceProductDTO;
+import io.holoinsight.server.common.dao.transformer.MetricJsonMapper;
 
-@Mapper(componentModel = "spring", uses = {MetricJsonMapper.class, FormJsonMapper.class})
+@Mapper(componentModel = "spring", uses = {MetricJsonMapper.class, IntegrationFormJsonMapper.class})
 public interface MarketplaceProductConverter {
 
   MarketplaceProductDTO doToDTO(MarketplaceProduct MarketplaceProduct);

diff --git a/...ome/dal/converter/MetaTableConverter.java → ...mon/dao/converter/MetaTableConverter.java b/...ome/dal/converter/MetaTableConverter.java → ...mon/dao/converter/MetaTableConverter.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2022 Holoinsight Project Authors. Licensed under Apache-2.0.
  */
-package io.holoinsight.server.home.dal.converter;
+package io.holoinsight.server.common.dao.converter;
 
-import io.holoinsight.server.home.dal.model.MetaTable;
-import io.holoinsight.server.home.dal.model.dto.MetaTableDTO;
-import io.holoinsight.server.home.dal.transformer.MetaTableConfigMapper;
-import io.holoinsight.server.home.dal.transformer.MetaTableSchemaMapper;
+import io.holoinsight.server.common.dao.entity.MetaTable;
+import io.holoinsight.server.common.dao.entity.dto.MetaTableDTO;
+import io.holoinsight.server.common.dao.transformer.MetaTableConfigMapper;
+import io.holoinsight.server.common.dao.transformer.MetaTableSchemaMapper;
 import org.mapstruct.Mapper;
 
 import java.util.List;

diff --git a/...ome/dal/converter/TenantOpsConverter.java → ...mon/dao/converter/TenantOpsConverter.java b/...ome/dal/converter/TenantOpsConverter.java → ...mon/dao/converter/TenantOpsConverter.java
@@ -1,7 +1,7 @@
 /*
  * Copyright 2022 Holoinsight Project Authors. Licensed under Apache-2.0.
  */
-package io.holoinsight.server.home.dal.converter;
+package io.holoinsight.server.common.dao.converter;
 
 import io.holoinsight.server.common.dao.entity.TenantOps;
 import io.holoinsight.server.common.dao.entity.dto.TenantOpsDTO;

diff --git a/...dal/model/dto/CustomPluginPeriodType.java → ...mon/dao/emuns/CustomPluginPeriodType.java b/...dal/model/dto/CustomPluginPeriodType.java → ...mon/dao/emuns/CustomPluginPeriodType.java
@@ -1,7 +1,7 @@
 /*
  * Copyright 2022 Holoinsight Project Authors. Licensed under Apache-2.0.
  */
-package io.holoinsight.server.home.dal.model.dto;
+package io.holoinsight.server.common.dao.emuns;
 
 /**
  *

diff --git a/...home/dal/model/dto/CloudMonitorRange.java → .../common/dao/entity/CloudMonitorRange.java b/...home/dal/model/dto/CloudMonitorRange.java → .../common/dao/entity/CloudMonitorRange.java
@@ -1,7 +1,7 @@
 /*
  * Copyright 2022 Holoinsight Project Authors. Licensed under Apache-2.0.
  */
-package io.holoinsight.server.home.dal.model.dto;
+package io.holoinsight.server.common.dao.entity;
 
 
 import lombok.Data;

diff --git a/...ight/server/home/dal/model/Dashboard.java → ...t/server/common/dao/entity/Dashboard.java b/...ight/server/home/dal/model/Dashboard.java → ...t/server/common/dao/entity/Dashboard.java
@@ -1,7 +1,7 @@
 /*
  * Copyright 2022 Holoinsight Project Authors. Licensed under Apache-2.0.
  */
-package io.holoinsight.server.home.dal.model;
+package io.holoinsight.server.common.dao.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

diff --git a/...ht/server/home/dal/model/DisplayMenu.java → ...server/common/dao/entity/DisplayMenu.java b/...ht/server/home/dal/model/DisplayMenu.java → ...server/common/dao/entity/DisplayMenu.java
@@ -1,7 +1,7 @@
 /*
  * Copyright 2022 Holoinsight Project Authors. Licensed under Apache-2.0.
  */
-package io.holoinsight.server.home.dal.model;
+package io.holoinsight.server.common.dao.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

diff --git a/...erver/home/dal/model/DisplayTemplate.java → ...er/common/dao/entity/DisplayTemplate.java b/...erver/home/dal/model/DisplayTemplate.java → ...er/common/dao/entity/DisplayTemplate.java
@@ -1,7 +1,7 @@
 /*
  * Copyright 2022 Holoinsight Project Authors. Licensed under Apache-2.0.
  */
-package io.holoinsight.server.home.dal.model;
+package io.holoinsight.server.common.dao.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

diff --git a/...insight/server/home/dal/model/Folder.java → ...ight/server/common/dao/entity/Folder.java b/...insight/server/home/dal/model/Folder.java → ...ight/server/common/dao/entity/Folder.java
@@ -1,7 +1,7 @@
 /*
  * Copyright 2022 Holoinsight Project Authors. Licensed under Apache-2.0.
  */
-package io.holoinsight.server.home.dal.model;
+package io.holoinsight.server.common.dao.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

diff --git a/...on/common-dao/src/main/java/io/holoinsight/server/common/dao/entity/GaeaCollectRange.java b/...on/common-dao/src/main/java/io/holoinsight/server/common/dao/entity/GaeaCollectRange.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2022 Holoinsight Project Authors. Licensed under Apache-2.0.
+ */
+
+package io.holoinsight.server.common.dao.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author jsy1001de
+ * @version 1.0: GaeaCollectRange.java, Date: 2024-06-14 Time: 14:20
+ */
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class GaeaCollectRange implements Serializable {
+  private static final long serialVersionUID = -2140563386879600142L;
+
+  public String type;
+  public CloudMonitorRange cloudmonitor;
+
+  public boolean isEqual(GaeaCollectRange originalRecord) {
+    if ((originalRecord == null)
+        || (this.cloudmonitor == null && originalRecord.cloudmonitor != null)
+        || (this.cloudmonitor != null && originalRecord.cloudmonitor == null)) {
+      return false;
+    }
+    return this.cloudmonitor.isEqual(originalRecord.cloudmonitor);
+  }
+}
diff --git a/.../home/dal/model/IntegrationGenerated.java → ...mmon/dao/entity/IntegrationGenerated.java b/.../home/dal/model/IntegrationGenerated.java → ...mmon/dao/entity/IntegrationGenerated.java
@@ -1,7 +1,7 @@
 /*
  * Copyright 2022 Holoinsight Project Authors. Licensed under Apache-2.0.
  */
-package io.holoinsight.server.home.dal.model;
+package io.holoinsight.server.common.dao.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

diff --git a/...ver/home/dal/model/IntegrationPlugin.java → .../common/dao/entity/IntegrationPlugin.java b/...ver/home/dal/model/IntegrationPlugin.java → .../common/dao/entity/IntegrationPlugin.java
@@ -1,7 +1,7 @@
 /*
  * Copyright 2022 Holoinsight Project Authors. Licensed under Apache-2.0.
  */
-package io.holoinsight.server.home.dal.model;
+package io.holoinsight.server.common.dao.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

diff --git a/...er/home/dal/model/IntegrationProduct.java → ...common/dao/entity/IntegrationProduct.java b/...er/home/dal/model/IntegrationProduct.java → ...common/dao/entity/IntegrationProduct.java
@@ -1,7 +1,7 @@
 /*
  * Copyright 2022 Holoinsight Project Authors. Licensed under Apache-2.0.
  */
-package io.holoinsight.server.home.dal.model;
+package io.holoinsight.server.common.dao.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

diff --git a/...ver/home/dal/model/MarketplacePlugin.java → .../common/dao/entity/MarketplacePlugin.java b/...ver/home/dal/model/MarketplacePlugin.java → .../common/dao/entity/MarketplacePlugin.java
@@ -1,7 +1,7 @@
 /*
  * Copyright 2022 Holoinsight Project Authors. Licensed under Apache-2.0.
  */
-package io.holoinsight.server.home.dal.model;
+package io.holoinsight.server.common.dao.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

diff --git a/...er/home/dal/model/MarketplaceProduct.java → ...common/dao/entity/MarketplaceProduct.java b/...er/home/dal/model/MarketplaceProduct.java → ...common/dao/entity/MarketplaceProduct.java
@@ -1,7 +1,7 @@
 /*
  * Copyright 2022 Holoinsight Project Authors. Licensed under Apache-2.0.
  */
-package io.holoinsight.server.home.dal.model;
+package io.holoinsight.server.common.dao.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

diff --git a/...ight/server/home/dal/model/MetaTable.java → ...t/server/common/dao/entity/MetaTable.java b/...ight/server/home/dal/model/MetaTable.java → ...t/server/common/dao/entity/MetaTable.java
@@ -1,13 +1,13 @@
 /*
  * Copyright 2022 Holoinsight Project Authors. Licensed under Apache-2.0.
  */
-package io.holoinsight.server.home.dal.model;
+package io.holoinsight.server.common.dao.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import javax.persistence.Table;
 import java.util.Date;
 
 /**
@@ -16,7 +16,7 @@
  * @version 1.0: MetaTable.java, v 0.1 2022年03月22日 11:34 上午 jinsong.yjs Exp $
  */
 @Data
-@Table(name = "meta_table")
+@TableName("meta_table")
 public class MetaTable {
 
   @TableId(type = IdType.AUTO)

diff --git a/...er/home/dal/model/TraceAgentConfProp.java → ...common/dao/entity/TraceAgentConfProp.java b/...er/home/dal/model/TraceAgentConfProp.java → ...common/dao/entity/TraceAgentConfProp.java
@@ -1,28 +1,21 @@
 /*
  * Copyright 2022 Holoinsight Project Authors. Licensed under Apache-2.0.
  */
-package io.holoinsight.server.home.dal.model;
+package io.holoinsight.server.common.dao.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import javax.persistence.Column;
 
 @Data
 @TableName("trace_agent_configuration_properties")
 public class TraceAgentConfProp {
   private String type;
   private String language;
-  @Column(name = "prop_key")
   private String propKey;
   private String name;
-  @Column(name = "c_name")
   private String cName;
   private String description;
-  @Column(name = "c_description")
   private String cDescription;
-  @Column(name = "check_expression")
   private String checkExpression;
-
-
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,7 +44,7 @@ fi @@
     # GC
-    JAVA_OPTS="$JAVA_OPTS -XX:CMSInitiatingOccupancyFraction=65 -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -XX:+CMSParallelRemarkEnabled -XX:+UseCMSInitiatingOccupancyOnly -XX:+CMSScavengeBeforeRemark -XX:CMSMaxAbortablePrecleanTime=5000 -XX:CMSScheduleRemarkEdenPenetration=50 -XX:+CMSParallelInitialMarkEnabled -XX:PermSize=256m -XX:MaxPermSize=256m -XX:MetaspaceSize=256m -XX:MaxMetaspaceSize=256m -XX:+UseCMSCompactAtFullCollection -XX:CMSFullGCsBeforeCompaction=3"
+    JAVA_OPTS="$JAVA_OPTS -XX:CMSInitiatingOccupancyFraction=75 -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -XX:+CMSParallelRemarkEnabled -XX:+UseCMSInitiatingOccupancyOnly -XX:+CMSScavengeBeforeRemark -XX:CMSMaxAbortablePrecleanTime=5000 -XX:CMSScheduleRemarkEdenPenetration=50 -XX:+CMSParallelInitialMarkEnabled -XX:PermSize=256m -XX:MaxPermSize=256m -XX:MetaspaceSize=256m -XX:MaxMetaspaceSize=256m -XX:+UseCMSCompactAtFullCollection -XX:CMSFullGCsBeforeCompaction=3"
     JAVA_OPTS="$JAVA_OPTS -Xloggc:/home/admin/logs/gc.log -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+PrintAdaptiveSizePolicy -XX:+PrintTenuringDistribution -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=100m -verbose:gc -XX:+DisableExplicitGC"
     # other
@@ Expand Down @@