You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2020/07/02 05:44:44 UTC
[shardingsphere-elasticjob-lite] branch master updated: Remove job
monitor port config from console (#890) (#891)
This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob-lite.git
The following commit(s) were added to refs/heads/master by this push:
new ca06bec Remove job monitor port config from console (#890) (#891)
ca06bec is described below
commit ca06bec8793669f000d118afce2a54a021dd104d
Author: Tboy <gu...@immomo.com>
AuthorDate: Thu Jul 2 13:44:38 2020 +0800
Remove job monitor port config from console (#890) (#891)
---
.../console/html/status/job/job_config.html | 8 -------
.../resources/console/i18n/message_en.properties | 2 --
.../resources/console/i18n/message_zh.properties | 2 --
.../resources/console/js/status/job/job_config.js | 25 +---------------------
.../console/js/status/job/jobs_status_overview.js | 1 -
5 files changed, 1 insertion(+), 37 deletions(-)
diff --git a/elastic-job-lite-console/src/main/resources/console/html/status/job/job_config.html b/elastic-job-lite-console/src/main/resources/console/html/status/job/job_config.html
index 17fd2c2..cda8469 100644
--- a/elastic-job-lite-console/src/main/resources/console/html/status/job/job_config.html
+++ b/elastic-job-lite-console/src/main/resources/console/html/status/job/job_config.html
@@ -73,14 +73,6 @@
</div>
<div class="col-sm-3">
<div class="form-group">
- <label for="monitor-port" class="col-sm-6 control-label" data-lang="job-monitor-port"></label>
- <div class="col-sm-6">
- <input type="number" max=65535 id="monitor-port" name="monitorPort" class="form-control" data-toggle="tooltip" data-placement="bottom" title="抓取作业注册信息监听服务端口。配置为-1表示不启用监听服务。" />
- </div>
- </div>
- </div>
- <div class="col-sm-4">
- <div class="form-group">
<label for="reconcile-interval-minutes" class="col-sm-6 control-label" data-lang="job-reconcile-interval-minutes"></label>
<div class="col-sm-6">
<input type="number" id="reconcile-interval-minutes" name="reconcileIntervalMinutes" class="form-control" data-toggle="tooltip" data-placement="bottom" title="修复错误状态的作业服务器扫描修复周期。配置为-1表示不启用修复动作。" />
diff --git a/elastic-job-lite-console/src/main/resources/console/i18n/message_en.properties b/elastic-job-lite-console/src/main/resources/console/i18n/message_en.properties
index ab4f335..0e7b431 100644
--- a/elastic-job-lite-console/src/main/resources/console/i18n/message_en.properties
+++ b/elastic-job-lite-console/src/main/resources/console/i18n/message_en.properties
@@ -91,7 +91,6 @@ job-error-handler=Job error handler
job-cron=Crontab
job-sharding-total-count=Sharding total count
job-max-time-diff-seconds=Max time diff seconds
-job-monitor-port=Monitor port
job-reconcile-interval-minutes=Reconcile interval minutes
job-monitor-execution=Monitor execution
job-failover=Failover
@@ -115,7 +114,6 @@ placeholder-cron=The cron expression for the job start time
placeholder-sharding-total-count=Sharding total count
placeholder-job-parameter=You can configure multiple identical jobs, but use different parameters as different scheduling instances
placeholder-max-time-diff-seconds=If the time error exceeds the number of configured seconds, the problem will be thrown when the job starts. The configuration is -1 for not checking the time error.
-placeholder-monitor-port=Grab the job registration information to listen for the service port. Configuration -1 indicates that the listener service is not enabled.
placeholder-reconcile-interval-minutes=Fix the error-state job server scan repair cycle. The configuration is -1 indicating that the fix action is not enabled.
placeholder-monitor-execution=Each job execution time and interval time is very short, suggest not to monitor homework runtime state in order to enhance efficiency, because it is a transient state, so no need to monitor. Users will be asked to increase their own data accumulation monitoring. There is no guarantee that the data will be repeated, which should be achieved in the operation. It also fails to implement the job failure transfer. It is recommended that the monitoring operation s [...]
placeholder-failover=Whether open task execution failure, open said if the job tasks performed in a halfway down, allowing the time unfinished task on the node of another job compensation is carried out.
diff --git a/elastic-job-lite-console/src/main/resources/console/i18n/message_zh.properties b/elastic-job-lite-console/src/main/resources/console/i18n/message_zh.properties
index 0f0a672..877ea2d 100644
--- a/elastic-job-lite-console/src/main/resources/console/i18n/message_zh.properties
+++ b/elastic-job-lite-console/src/main/resources/console/i18n/message_zh.properties
@@ -91,7 +91,6 @@ job-error-handler=定制异常处理类全路径
job-cron=Cron表达式
job-sharding-total-count=作业分片总数
job-max-time-diff-seconds=最大容忍本机与注册中心的时间误差秒数
-job-monitor-port=监听作业端口
job-reconcile-interval-minutes=作业服务器状态修复周期
job-monitor-execution=监控作业执行时状态
job-failover=支持自动失效转移
@@ -115,7 +114,6 @@ placeholder-cron=作业启动时间的cron表达式
placeholder-sharding-total-count=作业分片总数
placeholder-job-parameter=可以配置多个相同的作业，但是用不同的参数作为不同的调度实例
placeholder-max-time-diff-seconds=如果时间误差超过配置秒数则作业启动时将抛异常。配置为-1表示不检查时间误差。
-placeholder-monitor-port=抓取作业注册信息监听服务端口。配置为-1表示不启用监听服务。
placeholder-reconcile-interval-minutes=修复错误状态的作业服务器扫描修复周期。配置为-1表示不启用修复动作。
placeholder-monitor-execution=每次作业执行时间和间隔时间均非常短的情况，建议不监控作业运行时状态以提升效率，因为是瞬时状态，所以无必要监控。请用户自行增加数据堆积监控。并且不能保证数据重复选取，应在作业中实现幂等性。也无法实现作业失效转移。每次作业执行时间和间隔时间均较长短的情况，建议监控作业运行时状态，可保证数据不会重复选取。
placeholder-failover=是否开启任务执行失效转移，开启表示如果作业在一次任务执行中途宕机，允许将该次未完成的任务在另一作业节点上补偿执行。
diff --git a/elastic-job-lite-console/src/main/resources/console/js/status/job/job_config.js b/elastic-job-lite-console/src/main/resources/console/js/status/job/job_config.js
index ec49f0f..dc63a70 100644
--- a/elastic-job-lite-console/src/main/resources/console/js/status/job/job_config.js
+++ b/elastic-job-lite-console/src/main/resources/console/js/status/job/job_config.js
@@ -54,7 +54,6 @@ function bindSubmitJobSettingsForm() {
var cron = $("#cron").val();
var streamingProcess = $("#streaming-process").prop("checked");
var maxTimeDiffSeconds = $("#max-time-diff-seconds").val();
- var monitorPort = $("#monitor-port").val();
var monitorExecution = $("#monitor-execution").prop("checked");
var failover = $("#failover").prop("checked");
var misfire = $("#misfire").prop("checked");
@@ -70,7 +69,7 @@ function bindSubmitJobSettingsForm() {
var jobErrorHandler = $("#job-error-handler").val();
var description = $("#description").val();
var reconcileIntervalMinutes = $("#reconcile-interval-minutes").val();
- var postJson = {jobName: jobName, jobType : jobType, shardingTotalCount: shardingTotalCount, jobParameter: jobParameter, cron: cron, streamingProcess: streamingProcess, maxTimeDiffSeconds: maxTimeDiffSeconds, monitorPort: monitorPort, monitorExecution: monitorExecution, failover: failover, misfire: misfire, shardingItemParameters: shardingItemParameters, jobShardingStrategyType: jobShardingStrategyType, jobExecutorServiceHandler: jobExecutorServiceHandler, jobErrorHandler: jo [...]
+ var postJson = {jobName: jobName, jobType : jobType, shardingTotalCount: shardingTotalCount, jobParameter: jobParameter, cron: cron, streamingProcess: streamingProcess, maxTimeDiffSeconds: maxTimeDiffSeconds, monitorExecution: monitorExecution, failover: failover, misfire: misfire, shardingItemParameters: shardingItemParameters, jobShardingStrategyType: jobShardingStrategyType, jobExecutorServiceHandler: jobExecutorServiceHandler, jobErrorHandler: jobErrorHandler, description [...]
var jobParams = getJobParams();
if (jobParams.monitorExecution !== monitorExecution || jobParams.failover !== failover || jobParams.misfire !== misfire) {
showUpdateConfirmModal();
@@ -131,28 +130,6 @@ function validate() {
message: $.i18n.prop("job-cron-not-null")
}
}
- },
- monitorPort: {
- validators: {
- regexp: {
- regexp: /^(-?\d+)?$/,
- message: $.i18n.prop("job-monitor-port-should-be-integer")
- },
- notEmpty: {
- message: $.i18n.prop("job-monitor-port-not-null")
- },
- callback: {
- message: $.i18n.prop("job-monitor-port-range-limit"),
- callback: function(value, validator) {
- var monitorPort = parseInt(validator.getFieldElements("monitorPort").val(), 10);
- if (monitorPort <= 65535) {
- validator.updateStatus("monitorPort", "VALID");
- return true;
- }
- return false;
- }
- }
- }
}
}
});
diff --git a/elastic-job-lite-console/src/main/resources/console/js/status/job/jobs_status_overview.js b/elastic-job-lite-console/src/main/resources/console/js/status/job/jobs_status_overview.js
index e0f8c18..61ad5a7 100644
--- a/elastic-job-lite-console/src/main/resources/console/js/status/job/jobs_status_overview.js
+++ b/elastic-job-lite-console/src/main/resources/console/js/status/job/jobs_status_overview.js
@@ -232,7 +232,6 @@ function renderJob(data) {
$("#misfire").attr("checked", data.misfire);
$("#streaming-process").attr("checked", data.streamingProcess);
$("#max-time-diff-seconds").attr("value", data.maxTimeDiffSeconds);
- $("#monitor-port").attr("value", data.monitorPort);
$("#job-sharding-strategy-type").attr("value", data.jobShardingStrategyType);
$("#job-executor-service-handler").attr("value", data.jobExecutorServiceHandlerType);
$("#job-error-handler").attr("value", data.jobErrorHandlerType);