mirror of
https://github.com/PowerJob/PowerJob.git
synced 2025-07-17 00:00:04 +08:00
fix: Grammatical errors
This commit is contained in:
parent
374bae9fc1
commit
37cf53e0a9
@ -18,15 +18,13 @@ public enum TimeExpressionType {
|
|||||||
|
|
||||||
API(1),
|
API(1),
|
||||||
CRON(2),
|
CRON(2),
|
||||||
// FIXED_RATE
|
FIXED_RATE(3),
|
||||||
FIX_RATE(3),
|
FIXED_DELAY(4),
|
||||||
// FIXED_DELAY
|
|
||||||
FIX_DELAY(4),
|
|
||||||
WORKFLOW(5);
|
WORKFLOW(5);
|
||||||
|
|
||||||
int v;
|
int v;
|
||||||
|
|
||||||
public static final List<Integer> frequentTypes = Lists.newArrayList(FIX_RATE.v, FIX_DELAY.v);
|
public static final List<Integer> frequentTypes = Lists.newArrayList(FIXED_RATE.v, FIXED_DELAY.v);
|
||||||
|
|
||||||
public static TimeExpressionType of(int v) {
|
public static TimeExpressionType of(int v) {
|
||||||
for (TimeExpressionType type : values()) {
|
for (TimeExpressionType type : values()) {
|
||||||
|
@ -33,8 +33,8 @@ public class ValidateService {
|
|||||||
case API: return Lists.newArrayList(OmsConstant.NONE);
|
case API: return Lists.newArrayList(OmsConstant.NONE);
|
||||||
case WORKFLOW: return Lists.newArrayList("VALID: depends on workflow");
|
case WORKFLOW: return Lists.newArrayList("VALID: depends on workflow");
|
||||||
case CRON: return calculateCronExpression(timeExpression);
|
case CRON: return calculateCronExpression(timeExpression);
|
||||||
case FIX_RATE: return calculateFixRate(timeExpression);
|
case FIXED_RATE: return calculateFixRate(timeExpression);
|
||||||
case FIX_DELAY: return Lists.newArrayList("VALID: depends on execution cost time");
|
case FIXED_DELAY: return Lists.newArrayList("VALID: depends on execution cost time");
|
||||||
}
|
}
|
||||||
// impossible
|
// impossible
|
||||||
return Collections.emptyList();
|
return Collections.emptyList();
|
||||||
|
@ -88,7 +88,7 @@ public class FrequentTaskTracker extends TaskTracker {
|
|||||||
|
|
||||||
// 2. 启动任务发射器
|
// 2. 启动任务发射器
|
||||||
launcher = new Launcher();
|
launcher = new Launcher();
|
||||||
if (timeExpressionType == TimeExpressionType.FIX_RATE) {
|
if (timeExpressionType == TimeExpressionType.FIXED_RATE) {
|
||||||
// 固定频率需要设置最小间隔
|
// 固定频率需要设置最小间隔
|
||||||
if (timeParams < MIN_INTERVAL) {
|
if (timeParams < MIN_INTERVAL) {
|
||||||
throw new PowerJobException("time interval too small, please set the timeExpressionInfo >= 1000");
|
throw new PowerJobException("time interval too small, please set the timeExpressionInfo >= 1000");
|
||||||
@ -172,7 +172,7 @@ public class FrequentTaskTracker extends TaskTracker {
|
|||||||
|
|
||||||
// 判断是否超出最大执行实例数
|
// 判断是否超出最大执行实例数
|
||||||
if (maxInstanceNum > 0) {
|
if (maxInstanceNum > 0) {
|
||||||
if (timeExpressionType == TimeExpressionType.FIX_RATE) {
|
if (timeExpressionType == TimeExpressionType.FIXED_RATE) {
|
||||||
if (subInstanceId2TimeHolder.size() > maxInstanceNum) {
|
if (subInstanceId2TimeHolder.size() > maxInstanceNum) {
|
||||||
log.warn("[FQTaskTracker-{}] cancel to launch the subInstance({}) due to too much subInstance is running.", instanceId, subInstanceId);
|
log.warn("[FQTaskTracker-{}] cancel to launch the subInstance({}) due to too much subInstance is running.", instanceId, subInstanceId);
|
||||||
processFinishedSubInstance(subInstanceId, false, "TOO_MUCH_INSTANCE");
|
processFinishedSubInstance(subInstanceId, false, "TOO_MUCH_INSTANCE");
|
||||||
@ -368,7 +368,7 @@ public class FrequentTaskTracker extends TaskTracker {
|
|||||||
taskPersistenceService.deleteAllSubInstanceTasks(instanceId, subInstanceId);
|
taskPersistenceService.deleteAllSubInstanceTasks(instanceId, subInstanceId);
|
||||||
|
|
||||||
// FIX_DELAY 则调度下次任务
|
// FIX_DELAY 则调度下次任务
|
||||||
if (timeExpressionType == TimeExpressionType.FIX_DELAY) {
|
if (timeExpressionType == TimeExpressionType.FIXED_DELAY) {
|
||||||
scheduledPool.schedule(launcher, timeParams, TimeUnit.MILLISECONDS);
|
scheduledPool.schedule(launcher, timeParams, TimeUnit.MILLISECONDS);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -115,8 +115,8 @@ public abstract class TaskTracker {
|
|||||||
try {
|
try {
|
||||||
TimeExpressionType timeExpressionType = TimeExpressionType.valueOf(req.getTimeExpressionType());
|
TimeExpressionType timeExpressionType = TimeExpressionType.valueOf(req.getTimeExpressionType());
|
||||||
switch (timeExpressionType) {
|
switch (timeExpressionType) {
|
||||||
case FIX_RATE:
|
case FIXED_RATE:
|
||||||
case FIX_DELAY:return new FrequentTaskTracker(req);
|
case FIXED_DELAY:return new FrequentTaskTracker(req);
|
||||||
default:return new CommonTaskTracker(req);
|
default:return new CommonTaskTracker(req);
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
@ -41,13 +41,13 @@ public class FrequentTaskTrackerTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testFixRateJob() throws Exception {
|
public void testFixRateJob() throws Exception {
|
||||||
remoteTaskTracker.tell(TestUtils.genServerScheduleJobReq(ExecuteType.STANDALONE, TimeExpressionType.FIX_RATE), null);
|
remoteTaskTracker.tell(TestUtils.genServerScheduleJobReq(ExecuteType.STANDALONE, TimeExpressionType.FIXED_RATE), null);
|
||||||
Thread.sleep(5000000);
|
Thread.sleep(5000000);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testFixDelayJob() throws Exception {
|
public void testFixDelayJob() throws Exception {
|
||||||
remoteTaskTracker.tell(TestUtils.genServerScheduleJobReq(ExecuteType.MAP_REDUCE, TimeExpressionType.FIX_DELAY), null);
|
remoteTaskTracker.tell(TestUtils.genServerScheduleJobReq(ExecuteType.MAP_REDUCE, TimeExpressionType.FIXED_DELAY), null);
|
||||||
Thread.sleep(5000000);
|
Thread.sleep(5000000);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -32,8 +32,8 @@ public class TestUtils {
|
|||||||
req.setTimeExpressionType(timeExpressionType.name());
|
req.setTimeExpressionType(timeExpressionType.name());
|
||||||
switch (timeExpressionType) {
|
switch (timeExpressionType) {
|
||||||
case CRON:req.setTimeExpression("0 * * * * ? ");
|
case CRON:req.setTimeExpression("0 * * * * ? ");
|
||||||
case FIX_RATE:
|
case FIXED_RATE:
|
||||||
case FIX_DELAY:req.setTimeExpression("5000");
|
case FIXED_DELAY:req.setTimeExpression("5000");
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (executeType) {
|
switch (executeType) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user