-
Notifications
You must be signed in to change notification settings - Fork 741
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'refs/remotes/upstream/master'
- Loading branch information
Showing
23 changed files
with
589 additions
and
119 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
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 |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <groupId>org.dromara.dynamictp</groupId> | ||
| <artifactId>dynamic-tp-extension</artifactId> | ||
| <version>${revision}</version> | ||
| <relativePath>../pom.xml</relativePath> | ||
| </parent> | ||
| <artifactId>dynamic-tp-extension-agent</artifactId> | ||
|
|
||
| <dependencies> | ||
| </dependencies> | ||
| </project> |
151 changes: 151 additions & 0 deletions
151
extension/extension-agent/src/main/java/org/dromara/dynamictp/core/aware/AgentAware.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,151 @@ | ||
| /* | ||
| * 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.aware; | ||
|
|
||
| import cn.hutool.core.util.ArrayUtil; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import org.apache.commons.collections4.CollectionUtils; | ||
| import org.dromara.dynamictp.core.support.task.runnable.DtpRunnable; | ||
|
|
||
| import java.lang.ref.SoftReference; | ||
| import java.lang.reflect.Field; | ||
| import java.util.Arrays; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.Objects; | ||
| import java.util.concurrent.ConcurrentHashMap; | ||
| import java.util.concurrent.Executor; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| import static org.dromara.dynamictp.common.constant.DynamicTpConst.DTP_EXECUTE_ENHANCED; | ||
| import static org.dromara.dynamictp.common.constant.DynamicTpConst.FALSE_STR; | ||
|
|
||
| /** | ||
| * deal agent wrapper | ||
| * @author txbao | ||
| */ | ||
| @Slf4j | ||
| @SuppressWarnings("all") | ||
| public class AgentAware extends TaskStatAware { | ||
|
|
||
| /** | ||
| * dtpRunnableCache key -> Runnable value -> DtpRunnable | ||
| */ | ||
| private final Map<Runnable, SoftReference<DtpRunnable>> dtpRunnableCache = new ConcurrentHashMap<>(); | ||
|
|
||
| @Override | ||
| public int getOrder() { | ||
| return Integer.MIN_VALUE; | ||
| } | ||
|
|
||
| @Override | ||
| public String getName() { | ||
| return "agent"; | ||
| } | ||
|
|
||
| private DtpRunnable determineDtpRunnable(List<Field> conditionalFields, Runnable r) throws IllegalAccessException { | ||
| for (Field field : conditionalFields) { | ||
| if (Objects.isNull(field)) { | ||
| continue; | ||
| } | ||
| field.setAccessible(true); | ||
| Runnable o = (Runnable) field.get(r); | ||
| if (o instanceof DtpRunnable) { | ||
| return (DtpRunnable) o; | ||
| } | ||
| // 纵向查找 | ||
| DtpRunnable dtpRunnable = getDtpRunnable(o.getClass(), o); | ||
| if (dtpRunnable != null) { | ||
| return dtpRunnable; | ||
| } | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| private DtpRunnable getDtpRunnable(Class<? extends Runnable> rClass, Runnable r) throws IllegalAccessException { | ||
| while (Runnable.class.isAssignableFrom(rClass)) { | ||
| Field[] declaredFields = rClass.getDeclaredFields(); | ||
| if (ArrayUtil.isNotEmpty(declaredFields)) { | ||
| List<Field> conditionFields = Arrays.stream(declaredFields) | ||
| .filter(ele -> Runnable.class.isAssignableFrom(ele.getType())) | ||
| .collect(Collectors.toList()); | ||
| if (CollectionUtils.isNotEmpty(conditionFields)) { | ||
| DtpRunnable dtpRunnable = determineDtpRunnable(conditionFields, r); | ||
| if (Objects.nonNull(dtpRunnable)) { | ||
| return dtpRunnable; | ||
| } | ||
| } | ||
| } | ||
| if (!Runnable.class.isAssignableFrom(rClass.getSuperclass())) { | ||
| break; | ||
| } | ||
| rClass = (Class<? extends Runnable>) rClass.getSuperclass(); | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| private Runnable getDtpRunnableInstance(Runnable r) { | ||
| if (r instanceof DtpRunnable) { | ||
| return r; | ||
| } | ||
| DtpRunnable dtpRunnable = null; | ||
| Class<? extends Runnable> rClass = r.getClass(); | ||
| try { | ||
| dtpRunnable = getDtpRunnable(rClass, r); | ||
| } catch (IllegalAccessException e) { | ||
| log.error("getDtpRunnable Error", e); | ||
| } | ||
| if (dtpRunnable == null) { | ||
| if (log.isWarnEnabled()) { | ||
| log.warn("DynamicTp aware [{}], can not find DtpRunnable.", getName()); | ||
| } | ||
| return r; | ||
| } | ||
| return dtpRunnable; | ||
| } | ||
|
|
||
| @Override | ||
| public Runnable beforeExecuteWrap(Executor executor, Thread t, Runnable r) { | ||
| Runnable runnableWrap = getDtpRunnableInstance(r); | ||
| if (runnableWrap instanceof DtpRunnable) { | ||
| dtpRunnableCache.put(r, new SoftReference<>((DtpRunnable) runnableWrap)); | ||
| } else { | ||
| // 被封装的wrapper没有找到DtpRunnable对象，那么就关闭某些监控指标，防止内存溢出 | ||
| System.setProperty(DTP_EXECUTE_ENHANCED, FALSE_STR); | ||
| } | ||
| return runnableWrap; | ||
| } | ||
|
|
||
| @Override | ||
| public Runnable afterExecuteWrap(Executor executor, Runnable r, Throwable t) { | ||
| SoftReference<DtpRunnable> remove = dtpRunnableCache.remove(r); | ||
| if (remove != null) { | ||
| return remove.get(); | ||
| } | ||
| return getDtpRunnableInstance(r); | ||
| } | ||
|
|
||
| @Override | ||
| public Runnable beforeRejectWrap(Runnable r, Executor executor) { | ||
| SoftReference<DtpRunnable> remove = dtpRunnableCache.remove(r); | ||
| if (remove != null) { | ||
| return remove.get(); | ||
| } | ||
| return getDtpRunnableInstance(r); | ||
| } | ||
| } |
1 change: 1 addition & 0 deletions
1
...agent/src/main/resources/META-INF/services/org.dromara.dynamictp.core.aware.ExecutorAware
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 @@ | ||
| org.dromara.dynamictp.core.aware.AgentAware |
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
Oops, something went wrong.