|
|
@@ -41,6 +41,10 @@ public class HandlerRepository {
|
|
41
|
41
|
/**
|
|
42
|
42
|
* params of jobhandler
|
|
43
|
43
|
*/
|
|
|
44
|
+ EXECUTOR_HANDLER,
|
|
|
45
|
+ /**
|
|
|
46
|
+ * params of jobhandler
|
|
|
47
|
+ */
|
|
44
|
48
|
EXECUTOR_PARAMS,
|
|
45
|
49
|
/**
|
|
46
|
50
|
* switch of glue job: 0-no，1-yes
|
|
|
@@ -60,21 +64,27 @@ public class HandlerRepository {
|
|
60
|
64
|
LOG_DATE
|
|
61
|
65
|
}
|
|
62
|
66
|
public enum ActionEnum{RUN, KILL, LOG, BEAT}
|
|
63
|
|
-
|
|
|
67
|
+
|
|
|
68
|
+ // jobhandler repository
|
|
|
69
|
+ private static ConcurrentHashMap<String, IJobHandler> handlerRepository = new ConcurrentHashMap<String, IJobHandler>();
|
|
|
70
|
+ public static void registJobHandler(String name, IJobHandler jobHandler){
|
|
|
71
|
+ handlerRepository.put(name, jobHandler);
|
|
|
72
|
+ logger.info("xxl-job register jobhandler success, name:{}, jobHandler:{}", name, jobHandler);
|
|
|
73
|
+ }
|
|
|
74
|
+
|
|
|
75
|
+ // thread repository of jobhandler
|
|
64
|
76
|
public static ConcurrentHashMap<String, HandlerThread> handlerTreadMap = new ConcurrentHashMap<String, HandlerThread>();
|
|
65
|
|
-
|
|
66
|
|
- // regist handler
|
|
67
|
|
- public static void regist(String handleName, IJobHandler handler){
|
|
|
77
|
+ public static HandlerThread registJobHandlerThread(String jobkey, IJobHandler handler){
|
|
68
|
78
|
HandlerThread handlerThread = new HandlerThread(handler);
|
|
69
|
79
|
handlerThread.start();
|
|
70
|
|
- handlerTreadMap.put(handleName, handlerThread); // putIfAbsent
|
|
71
|
|
- logger.info(">>>>>>>>>>> xxl-job regist handler success, handleName:{}, handler:{}", new Object[]{handleName, handler});
|
|
|
80
|
+ logger.info(">>>>>>>>>>> xxl-job regist handler success, jobkey:{}, handler:{}", new Object[]{jobkey, handler});
|
|
|
81
|
+ return handlerTreadMap.put(jobkey, handlerThread); // putIfAbsent
|
|
72
|
82
|
}
|
|
73
|
|
-
|
|
|
83
|
+
|
|
74
|
84
|
// handler push to queue
|
|
75
|
85
|
public static String service(Map<String, String> _param) {
|
|
76
|
86
|
logger.debug(">>>>>>>>>>> xxl-job service start, _param:{}", new Object[]{_param});
|
|
77
|
|
-
|
|
|
87
|
+
|
|
78
|
88
|
// callback
|
|
79
|
89
|
RemoteCallBack callback = new RemoteCallBack();
|
|
80
|
90
|
callback.setStatus(RemoteCallBack.FAIL);
|
|
|
@@ -91,7 +101,7 @@ public class HandlerRepository {
|
|
91
|
101
|
callback.setMsg("Timestamp check failed.");
|
|
92
|
102
|
return JacksonUtil.writeValueAsString(callback);
|
|
93
|
103
|
}
|
|
94
|
|
-
|
|
|
104
|
+
|
|
95
|
105
|
// parse namespace
|
|
96
|
106
|
if (namespace.equals(ActionEnum.RUN.name())) {
|
|
97
|
107
|
|
|
|
@@ -110,20 +120,40 @@ public class HandlerRepository {
|
|
110
|
120
|
return JacksonUtil.writeValueAsString(callback);
|
|
111
|
121
|
}
|
|
112
|
122
|
|
|
|
123
|
+ // load old thread
|
|
113
|
124
|
String jobKey = job_group.concat("_").concat(job_name);
|
|
114
|
125
|
HandlerThread handlerThread = handlerTreadMap.get(jobKey);
|
|
|
126
|
+
|
|
115
|
127
|
if ("0".equals(handler_glue_switch)) {
|
|
116
|
128
|
// bean model
|
|
117
|
|
- if (handlerThread == null) {
|
|
118
|
|
- callback.setMsg("handler for jobKey=[" + jobKey + "] not found.");
|
|
|
129
|
+
|
|
|
130
|
+ // handler name
|
|
|
131
|
+ String executor_handler = _param.get(HandlerParamEnum.EXECUTOR_HANDLER.name());
|
|
|
132
|
+ if (executor_handler==null || executor_handler.trim().length()==0){
|
|
|
133
|
+ callback.setMsg("EXECUTOR_HANDLER is null.");
|
|
119
|
134
|
return JacksonUtil.writeValueAsString(callback);
|
|
120
|
135
|
}
|
|
|
136
|
+
|
|
|
137
|
+ // handler instance
|
|
|
138
|
+ IJobHandler jobHandler = handlerRepository.get(executor_handler);
|
|
|
139
|
+
|
|
|
140
|
+ if (handlerThread == null) {
|
|
|
141
|
+ // jobhandler match
|
|
|
142
|
+ if (jobHandler==null) {
|
|
|
143
|
+ callback.setMsg("handler for jobKey=[" + jobKey + "] not found.");
|
|
|
144
|
+ return JacksonUtil.writeValueAsString(callback);
|
|
|
145
|
+ }
|
|
|
146
|
+ handlerThread = HandlerRepository.registJobHandlerThread(jobKey, jobHandler);
|
|
|
147
|
+ } else {
|
|
|
148
|
+ if (handlerThread.getHandler() != jobHandler) {
|
|
|
149
|
+ handlerThread = HandlerRepository.registJobHandlerThread(jobKey, jobHandler);
|
|
|
150
|
+ }
|
|
|
151
|
+ }
|
|
121
|
152
|
} else {
|
|
122
|
153
|
// glue
|
|
123
|
|
- if (handlerThread==null) {
|
|
124
|
|
- HandlerRepository.regist(jobKey, new GlueJobHandler(job_group, job_name));
|
|
|
154
|
+ if (handlerThread == null) {
|
|
|
155
|
+ handlerThread = HandlerRepository.registJobHandlerThread(jobKey, new GlueJobHandler(job_group, job_name));
|
|
125
|
156
|
}
|
|
126
|
|
- handlerThread = handlerTreadMap.get(jobKey);
|
|
127
|
157
|
}
|
|
128
|
158
|
|
|
129
|
159
|
// push data to queue
|
|
|
@@ -145,7 +175,7 @@ public class HandlerRepository {
|
|
145
|
175
|
IJobHandler handler = handlerThread.getHandler();
|
|
146
|
176
|
handlerThread.toStop();
|
|
147
|
177
|
handlerThread.interrupt();
|
|
148
|
|
- regist(jobKey, handler);
|
|
|
178
|
+ HandlerRepository.registJobHandlerThread(jobKey, handler);
|
|
149
|
179
|
callback.setStatus(RemoteCallBack.SUCCESS);
|
|
150
|
180
|
} else {
|
|
151
|
181
|
callback.setMsg("handler for jobKey=[" + jobKey + "] not found.");
|
|
|
@@ -179,11 +209,11 @@ public class HandlerRepository {
|
|
179
|
209
|
callback.setMsg("param[Action] is not valid.");
|
|
180
|
210
|
return JacksonUtil.writeValueAsString(callback);
|
|
181
|
211
|
}
|
|
182
|
|
-
|
|
|
212
|
+
|
|
183
|
213
|
logger.debug(">>>>>>>>>>> xxl-job service end, triggerData:{}");
|
|
184
|
|
- return JacksonUtil.writeValueAsString(callback);
|
|
|
214
|
+ return JacksonUtil.writeValueAsString(callback);
|
|
185
|
215
|
}
|
|
186
|
|
-
|
|
|
216
|
+
|
|
187
|
217
|
// ----------------------- for callback log -----------------------
|
|
188
|
218
|
private static LinkedBlockingQueue<HashMap<String, String>> callBackQueue = new LinkedBlockingQueue<HashMap<String, String>>();
|
|
189
|
219
|
static {
|
xueli.xue