-
Notifications
You must be signed in to change notification settings - Fork 766
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/dromara/dynamic-tp
- Loading branch information
Showing
16 changed files
with
244 additions
and
44 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -19,11 +19,42 @@ | |
|
||
/** | ||
* Priority related | ||
* <p>The {@link #getPriority()} is optional and represents a priority value as defined in the | ||
* {@link Priority} interface. Lower values have higher priority. The default value is | ||
* {@code Priority.LOWEST_PRECEDENCE}, indicating the lowest priority (losing to any | ||
* other specified priority value). | ||
* | ||
* @author <a href = "mailto:[email protected]">KamTo Hung</a> | ||
* @since 1.1.7 | ||
*/ | ||
public interface Priority { | ||
|
||
/** | ||
* Useful constant for the highest precedence value. | ||
* | ||
* @see java.lang.Integer#MIN_VALUE | ||
*/ | ||
int HIGHEST_PRECEDENCE = Integer.MIN_VALUE; | ||
|
||
/** | ||
* Useful constant for the lowest precedence value. | ||
* | ||
* @see java.lang.Integer#MAX_VALUE | ||
*/ | ||
int LOWEST_PRECEDENCE = Integer.MAX_VALUE; | ||
|
||
/** | ||
* Get the priority value of this object. | ||
* <p>Higher values are interpreted as lower priority. As a consequence, | ||
* the object with the lowest value has the highest priority (somewhat | ||
* analogous to Servlet {@code load-on-startup} values). | ||
* <p>Same priority values will result in arbitrary sort positions for the | ||
* affected objects. | ||
* | ||
* @return the priority value | ||
* @see #HIGHEST_PRECEDENCE | ||
* @see #LOWEST_PRECEDENCE | ||
*/ | ||
int getPriority(); | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -25,6 +25,7 @@ | |
* PriorityCallable related | ||
* | ||
* @author <a href = "mailto:[email protected]">KamTo Hung</a> | ||
* @since 1.1.7 | ||
*/ | ||
public class PriorityCallable<V> implements Priority, Callable<V> { | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -35,15 +35,11 @@ | |
* PriorityDtpExecutor related, extending DtpExecutor, implements priority feature | ||
* | ||
* @author <a href = "mailto:[email protected]">KamTo Hung</a> | ||
* @since 1.1.7 | ||
*/ | ||
@Slf4j | ||
public class PriorityDtpExecutor extends DtpExecutor { | ||
|
||
/** | ||
* The default priority. | ||
*/ | ||
private static final int DEFAULT_PRIORITY = 0; | ||
|
||
public PriorityDtpExecutor(int corePoolSize, | ||
int maximumPoolSize, | ||
long keepAliveTime, | ||
|
@@ -133,7 +129,7 @@ public void execute(Runnable command, int priority) { | |
|
||
@Override | ||
public Future<?> submit(Runnable task) { | ||
return super.submit(PriorityRunnable.of(task, DEFAULT_PRIORITY)); | ||
return super.submit(PriorityRunnable.of(task, Priority.LOWEST_PRECEDENCE)); | ||
} | ||
|
||
public Future<?> submit(Runnable task, int priority) { | ||
|
@@ -142,7 +138,7 @@ public Future<?> submit(Runnable task, int priority) { | |
|
||
@Override | ||
public <T> Future<T> submit(Runnable task, T result) { | ||
return super.submit(PriorityRunnable.of(task, DEFAULT_PRIORITY), result); | ||
return super.submit(PriorityRunnable.of(task, Priority.LOWEST_PRECEDENCE), result); | ||
} | ||
|
||
public <T> Future<T> submit(Runnable task, T result, int priority) { | ||
|
@@ -151,7 +147,7 @@ public <T> Future<T> submit(Runnable task, T result, int priority) { | |
|
||
@Override | ||
public <T> Future<T> submit(Callable<T> task) { | ||
return super.submit(PriorityCallable.of(task, DEFAULT_PRIORITY)); | ||
return super.submit(PriorityCallable.of(task, Priority.LOWEST_PRECEDENCE)); | ||
} | ||
|
||
public <T> Future<T> submit(Callable<T> task, int priority) { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,6 +24,7 @@ | |
* PriorityFutureTask related | ||
* | ||
* @author <a href = "mailto:[email protected]">KamTo Hung</a> | ||
* @since 1.1.7 | ||
*/ | ||
public class PriorityFutureTask<V> extends FutureTask<V> implements Priority { | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,6 +23,7 @@ | |
* PriorityRunnable related | ||
* | ||
* @author <a href = "mailto:[email protected]">KamTo Hung</a> | ||
* @since 1.1.7 | ||
*/ | ||
public class PriorityRunnable implements Priority, Runnable { | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
70 changes: 70 additions & 0 deletions
70
core/src/main/java/org/dromara/dynamictp/core/monitor/collector/jmx/JMXCollector.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,70 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You under the Apache License, Version 2.0 | ||
* (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.dromara.dynamictp.core.monitor.collector.jmx; | ||
|
||
import lombok.extern.slf4j.Slf4j; | ||
import org.dromara.dynamictp.common.em.CollectorTypeEnum; | ||
import org.dromara.dynamictp.common.entity.ThreadPoolStats; | ||
import org.dromara.dynamictp.core.monitor.collector.AbstractCollector; | ||
import org.springframework.beans.BeanUtils; | ||
|
||
import javax.management.JMException; | ||
import javax.management.MBeanServer; | ||
import javax.management.ObjectName; | ||
import java.lang.management.ManagementFactory; | ||
import java.util.Map; | ||
import java.util.concurrent.ConcurrentHashMap; | ||
|
||
/** | ||
* ThreadPoolStatsInfo related | ||
* | ||
* @author <a href = "mailto:[email protected]">KamTo Hung</a> | ||
*/ | ||
@Slf4j | ||
public class JMXCollector extends AbstractCollector { | ||
|
||
public static final String DTP_METRIC_NAME_PREFIX = "dtp.thread.pool"; | ||
|
||
/** | ||
* thread pool stats map | ||
*/ | ||
private static final Map<String, ThreadPoolStats> GAUGE_CACHE = new ConcurrentHashMap<>(); | ||
|
||
@Override | ||
public void collect(ThreadPoolStats threadPoolStats) { | ||
if (GAUGE_CACHE.containsKey(threadPoolStats.getPoolName())) { | ||
ThreadPoolStats poolStats = GAUGE_CACHE.get(threadPoolStats.getPoolName()); | ||
BeanUtils.copyProperties(threadPoolStats, poolStats); | ||
} else { | ||
try { | ||
MBeanServer server = ManagementFactory.getPlatformMBeanServer(); | ||
ObjectName name = new ObjectName(DTP_METRIC_NAME_PREFIX + ":name=" + threadPoolStats.getPoolName()); | ||
ThreadPoolStatsJMX stats = new ThreadPoolStatsJMX(threadPoolStats); | ||
server.registerMBean(stats, name); | ||
} catch (JMException e) { | ||
log.error("collect thread pool stats error", e); | ||
} | ||
GAUGE_CACHE.put(threadPoolStats.getPoolName(), threadPoolStats); | ||
} | ||
} | ||
|
||
@Override | ||
public String type() { | ||
return CollectorTypeEnum.JMX.name().toLowerCase(); | ||
} | ||
|
||
} |
41 changes: 41 additions & 0 deletions
41
core/src/main/java/org/dromara/dynamictp/core/monitor/collector/jmx/ThreadPoolStatsJMX.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You under the Apache License, Version 2.0 | ||
* (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.dromara.dynamictp.core.monitor.collector.jmx; | ||
|
||
import org.dromara.dynamictp.common.entity.ThreadPoolStats; | ||
|
||
/** | ||
* @author <a href = "mailto:[email protected]">KamTo Hung</a> | ||
*/ | ||
public class ThreadPoolStatsJMX implements ThreadPoolStatsMXBean { | ||
|
||
private ThreadPoolStats threadPoolStats; | ||
|
||
public ThreadPoolStatsJMX(ThreadPoolStats threadPoolStats) { | ||
this.threadPoolStats = threadPoolStats; | ||
} | ||
|
||
@Override | ||
public ThreadPoolStats getThreadPoolStats() { | ||
return this.threadPoolStats; | ||
} | ||
|
||
@Override | ||
public void setThreadPoolStats(ThreadPoolStats threadPoolStats) { | ||
this.threadPoolStats = threadPoolStats; | ||
} | ||
} |
Oops, something went wrong.