Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.1.6 snapshot #3

Merged
merged 16 commits into from
Jul 12, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
[![GitHub release](https://img.shields.io/github/release/dangdangdotcom/elastic-job.svg)](https://github.com/dangdangdotcom/elastic-job/releases)
[![Hex.pm](http://dangdangdotcom.github.io/elastic-job/elastic-job-lite/img/license.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)

# [Elastic-Job-Lite中文主页](http://dangdangdotcom.github.io/elastic-job/elastic-job-lite)
# [Elastic-Job-Cloud中文主页](http://dangdangdotcom.github.io/elastic-job/elastic-job-cloud)
# [Elastic-Job-Lite中文主页](http://dangdangdotcom.github.io/elastic-job/elastic-job-lite) [![GitHub release](https://img.shields.io/badge/release-download-orange.svg)](https://dangdangdotcom.github.io/elastic-job/elastic-job-lite/dist/elastic-job-lite-console-2.1.4.tar.gz)
# [Elastic-Job-Cloud中文主页](http://dangdangdotcom.github.io/elastic-job/elastic-job-cloud) [![GitHub release](https://img.shields.io/badge/release-download-orange.svg)](https://dangdangdotcom.github.io/elastic-job/elastic-job-cloud/dist/elastic-job-cloud-scheduler-2.1.4.tar.gz)
# [Elastic-Job 1.x中文主页(已废弃)](http://dangdangdotcom.github.io/elastic-job/elastic-job-lite-1.x)

# Overview
Expand Down
12 changes: 12 additions & 0 deletions RELEASE-NOTES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
## 2.1.6

## 2.1.5

### 新功能

1. [ISSUE #373](https://github.com/dangdangdotcom/elastic-job/issues/373) Cloud可区分处理TASK_UNREACHABLE, TASK_UNKNOW, TASK_DROPPED, TASK_GONE等状态

### 缺陷修正

1. [ISSUE #367](https://github.com/dangdangdotcom/elastic-job/issues/367) Cloud禁用作业并未停止生成Ready队列,造成重新启用后堆积作业大量执行
1. [ISSUE #382](https://github.com/dangdangdotcom/elastic-job/issues/382) 界面验证错误,不应校验分片总数上限
1. [ISSUE #383](https://github.com/dangdangdotcom/elastic-job/issues/383) 界面验证错误,不应校验监听端口下限

## 2.1.4

### 功能提升
Expand Down
2 changes: 1 addition & 1 deletion elastic-job-cloud/elastic-job-cloud-executor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>elastic-job-cloud</artifactId>
<groupId>com.dangdang</groupId>
<version>2.1.5-SNAPSHOT</version>
<version>2.1.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>elastic-job-cloud-executor</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion elastic-job-cloud/elastic-job-cloud-scheduler/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>elastic-job-cloud</artifactId>
<groupId>com.dangdang</groupId>
<version>2.1.5-SNAPSHOT</version>
<version>2.1.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>elastic-job-cloud-scheduler</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,7 @@ public String getFrameworkHostPort() {
* @return Mesos配置对象
*/
public MesosConfiguration getMesosConfiguration() {
return new MesosConfiguration(getValue(EnvironmentArgument.USER), getValue(EnvironmentArgument.MESOS_URL), getValue(EnvironmentArgument.HOSTNAME), Boolean
.valueOf(getValue(EnvironmentArgument.ENABLE_PARTITION_AWARE)));
return new MesosConfiguration(getValue(EnvironmentArgument.USER), getValue(EnvironmentArgument.MESOS_URL), getValue(EnvironmentArgument.HOSTNAME));
}

/**
Expand Down Expand Up @@ -218,9 +217,7 @@ public enum EnvironmentArgument {

EVENT_TRACE_RDB_PASSWORD("event_trace_rdb_password", "", false),

RECONCILE_INTERVAL_MINUTES("reconcile_interval_minutes", "-1", false),

ENABLE_PARTITION_AWARE("enable_partition_aware", "false", false);
RECONCILE_INTERVAL_MINUTES("reconcile_interval_minutes", "-1", false);

private final String key;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,4 @@ public final class MesosConfiguration {
private final String url;

private final String hostname;

private final Boolean enablePartitionAware;
}
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,7 @@ private SchedulerDriver getSchedulerDriver(final TaskScheduler taskScheduler, fi
builder.setRole(role.get());
frameworkName += "-" + role.get();
}
if (env.getMesosConfiguration().getEnablePartitionAware()) {
builder.addCapabilitiesBuilder().setType(Protos.FrameworkInfo.Capability.Type.PARTITION_AWARE);
}
builder.addCapabilitiesBuilder().setType(Protos.FrameworkInfo.Capability.Type.PARTITION_AWARE);
MesosConfiguration mesosConfig = env.getMesosConfiguration();
Protos.FrameworkInfo frameworkInfo = builder.setUser(mesosConfig.getUser()).setName(frameworkName)
.setHostname(mesosConfig.getHostname()).setFailoverTimeout(FRAMEWORK_FAILOVER_TIMEOUT_SECONDS)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<div class="form-group">
<label for="sharding-total-count" class="col-sm-6 control-label" data-lang="job-sharding-total-count"><i>*</i></label>
<div class="col-sm-6">
<input type="number" min=1 max=100 value=1 id="sharding-total-count" name="shardingTotalCount" class="form-control" data-toggle="tooltip" data-placement="bottom" title="作业分片总数"/>
<input type="number" min=1 value=1 id="sharding-total-count" name="shardingTotalCount" class="form-control" data-toggle="tooltip" data-placement="bottom" title="作业分片总数"/>
</div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<div class="form-group">
<label for="sharding-total-count" class="col-sm-6 control-label" data-lang="job-sharding-total-count"><i>*</i></label>
<div class="col-sm-6">
<input type="number" disabled="disabled" min=1 max=100 value=1 id="sharding-total-count" name="shardingTotalCount" class="form-control" data-toggle="tooltip" data-placement="bottom" title="作业分片总数"/>
<input type="number" disabled="disabled" min=1 value=1 id="sharding-total-count" name="shardingTotalCount" class="form-control" data-toggle="tooltip" data-placement="bottom" title="作业分片总数"/>
</div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<div class="form-group">
<label for="sharding-total-count" class="col-sm-6 control-label" data-lang="job-sharding-total-count"><i>*</i></label>
<div class="col-sm-6">
<input type="number" min=1 max=100 value=1 id="sharding-total-count" name="shardingTotalCount" class="form-control" data-toggle="tooltip" data-placement="bottom" title="作业分片总数"/>
<input type="number" min=1 value=1 id="sharding-total-count" name="shardingTotalCount" class="form-control" data-toggle="tooltip" data-placement="bottom" title="作业分片总数"/>
</div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<div class="wrapper">
<header class="main-header">
<a class="logo">
<span class="logo-lg"><span id="logo-font-size">Elastic Job Cloud v2.1.5</span></span>
<span class="logo-lg"><span id="logo-font-size">Elastic Job Cloud v2.1.6</span></span>
</a>
<nav class="navbar navbar-static-top" role="navigation">
<div id="navbar" class="navbar-custom-menu">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ function splitFormatter(value) {
var replacement = "...";
if(null != value && value.length > maxLength) {
var vauleDetail = value.substring(0 , maxLength - replacement.length) + replacement;
return '<a href="javascript: void(0);" style="color:#FF0000;" onClick="showHistoryMessage(\'' + value.replace(/\n/g,"<br/>") + '\')">' + vauleDetail + '</a>';
value = value.replace(/\r\n/g,"<br/>").replace(/\n/g,"<br/>").replace(/\'/g, "\\'");
return '<a href="javascript: void(0);" style="color:#FF0000;" onClick="showHistoryMessage(\'' + value + '\')">' + vauleDetail + '</a>';
}
return value;
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ function splitRemarkFormatter(value, row) {
var replacement = "...";
if(null != value && value.length > maxLength) {
var valueDetail = value.substring(0 , maxLength - replacement.length) + replacement;
value = value.replace(/\n/g,"<br/>").replace(/\'/g, "\\'");
value = value.replace(/\r\n/g,"<br/>").replace(/\n/g,"<br/>").replace(/\'/g, "\\'");
var remarkHtml;
if ("TASK_FAILED" === row.state || "TASK_ERROR" === row.state) {
remarkHtml = '<a href="javascript: void(0);" style="color:#FF0000;" onClick="showHistoryMessage(\'' + value + '\')">' + valueDetail + '</a>';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import static org.hamcrest.core.Is.is;
import static org.hamcrest.core.IsInstanceOf.instanceOf;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;

public final class BootstrapEnvironmentTest {

Expand Down Expand Up @@ -115,13 +114,4 @@ public void assertReconcileConfiguration() throws NoSuchFieldException {
assertThat(configuration.getReconcileIntervalMinutes(), is(0));
assertFalse(configuration.isEnabledReconcile());
}

@Test
public void assertEnablePartitionAware() throws NoSuchFieldException {
assertFalse(bootstrapEnvironment.getMesosConfiguration().getEnablePartitionAware());
Properties properties = new Properties();
properties.setProperty(EnvironmentArgument.ENABLE_PARTITION_AWARE.getKey(), "true");
ReflectionUtils.setFieldValue(bootstrapEnvironment, "properties", properties);
assertTrue(bootstrapEnvironment.getMesosConfiguration().getEnablePartitionAware());
}
}
2 changes: 1 addition & 1 deletion elastic-job-cloud/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>elastic-job</artifactId>
<groupId>com.dangdang</groupId>
<version>2.1.5-SNAPSHOT</version>
<version>2.1.6-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
<artifactId>elastic-job-cloud</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion elastic-job-common/elastic-job-common-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.dangdang</groupId>
<artifactId>elastic-job-common</artifactId>
<version>2.1.5-SNAPSHOT</version>
<version>2.1.6-SNAPSHOT</version>
</parent>
<artifactId>elastic-job-common-core</artifactId>
<name>${project.artifactId}</name>
Expand Down
2 changes: 1 addition & 1 deletion elastic-job-common/elastic-job-common-restful/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>elastic-job-common</artifactId>
<groupId>com.dangdang</groupId>
<version>2.1.5-SNAPSHOT</version>
<version>2.1.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>elastic-job-common-restful</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion elastic-job-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>elastic-job</artifactId>
<groupId>com.dangdang</groupId>
<version>2.1.5-SNAPSHOT</version>
<version>2.1.6-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
<artifactId>elastic-job-common</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion elastic-job-example/elastic-job-example-cloud/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>elastic-job-example</artifactId>
<groupId>com.dangdang</groupId>
<version>2.1.5-SNAPSHOT</version>
<version>2.1.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>elastic-job-example-cloud</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion elastic-job-example/elastic-job-example-embed-zk/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>elastic-job-example</artifactId>
<groupId>com.dangdang</groupId>
<version>2.1.5-SNAPSHOT</version>
<version>2.1.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>elastic-job-example-embed-zk</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion elastic-job-example/elastic-job-example-jobs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<artifactId>elastic-job-example</artifactId>
<groupId>com.dangdang</groupId>
<version>2.1.5-SNAPSHOT</version>
<version>2.1.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>elastic-job-example-jobs</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion elastic-job-example/elastic-job-example-lite-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>elastic-job-example</artifactId>
<groupId>com.dangdang</groupId>
<version>2.1.5-SNAPSHOT</version>
<version>2.1.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>elastic-job-example-lite-java</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>elastic-job-example</artifactId>
<groupId>com.dangdang</groupId>
<version>2.1.5-SNAPSHOT</version>
<version>2.1.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>elastic-job-example-lite-spring</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>elastic-job-example</artifactId>
<groupId>com.dangdang</groupId>
<version>2.1.5-SNAPSHOT</version>
<version>2.1.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
4 changes: 2 additions & 2 deletions elastic-job-example/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<groupId>com.dangdang</groupId>
<name>${project.artifactId}</name>
<packaging>pom</packaging>
<version>2.1.5-SNAPSHOT</version>
<version>2.1.6-SNAPSHOT</version>

<modules>
<module>elastic-job-example-jobs</module>
Expand All @@ -20,7 +20,7 @@

<properties>
<java.version>1.7</java.version>
<elastic-job.version>2.1.5-SNAPSHOT</elastic-job.version>
<elastic-job.version>2.1.6-SNAPSHOT</elastic-job.version>
<curator.version>2.10.0</curator.version>
<springframework.version>4.3.4.RELEASE</springframework.version>
<slf4j.version>1.7.7</slf4j.version>
Expand Down
2 changes: 1 addition & 1 deletion elastic-job-lite/elastic-job-lite-console/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.dangdang</groupId>
<artifactId>elastic-job-lite</artifactId>
<version>2.1.5-SNAPSHOT</version>
<version>2.1.6-SNAPSHOT</version>
</parent>
<artifactId>elastic-job-lite-console</artifactId>
<packaging>jar</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<div class="form-group">
<label for="sharding-total-count" class="col-sm-6 control-label" data-lang="job-sharding-total-count"></label>
<div class="col-sm-6">
<input type="number" min=1 max=100 id="sharding-total-count" name="shardingTotalCount" class="form-control" data-toggle="tooltip" data-placement="bottom" title="作业分片总数"/>
<input type="number" min=1 id="sharding-total-count" name="shardingTotalCount" class="form-control" data-toggle="tooltip" data-placement="bottom" title="作业分片总数"/>
</div>
</div>
</div>
Expand All @@ -64,7 +64,7 @@
<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" min=1000 max=65535 id="monitor-port" name="monitorPort" class="form-control" data-toggle="tooltip" data-placement="bottom" title="抓取作业注册信息监听服务端口。配置为-1表示不启用监听服务。" />
<input type="number" max=65535 id="monitor-port" name="monitorPort" class="form-control" data-toggle="tooltip" data-placement="bottom" title="抓取作业注册信息监听服务端口。配置为-1表示不启用监听服务。" />
</div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<div class="wrapper">
<header class="main-header">
<a class="logo">
<span class="logo-lg">Elastic Job Lite v2.1.5</span>
<span class="logo-lg">Elastic Job Lite v2.1.6</span>
</a>
<span id="index-job-name" hidden="hidden"></span>
<span id="index-server-ip" hidden="hidden"></span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ function splitFormatter(value) {
var replacement = "...";
if(null != value && value.length > maxLength) {
var vauleDetail = value.substring(0 , maxLength - replacement.length) + replacement;
return '<a href="javascript: void(0);" style="color:#FF0000;" onClick="showHistoryMessage(\'' + value.replace(/\n/g,"<br/>") + '\')">' + vauleDetail + '</a>';
value = value.replace(/\r\n/g,"<br/>").replace(/\n/g,"<br/>").replace(/\'/g, "\\'");
return '<a href="javascript: void(0);" style="color:#FF0000;" onClick="showHistoryMessage(\'' + value + '\')">' + vauleDetail + '</a>';
}
return value;
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ function splitRemarkFormatter(value, row) {
var replacement = "...";
if(null != value && value.length > maxLength) {
var valueDetail = value.substring(0 , maxLength - replacement.length) + replacement;
value = value.replace(/\n/g,"<br/>").replace(/\'/g, "\\'");
value = value.replace(/\r\n/g,"<br/>").replace(/\n/g,"<br/>").replace(/\'/g, "\\'");
var remarkHtml;
if ("TASK_FAILED" === row.state || "TASK_ERROR" === row.state) {
remarkHtml = '<a href="javascript: void(0);" style="color:#FF0000;" onClick="showHistoryMessage(\'' + value + '\')">' + valueDetail + '</a>';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ function validate() {
message: $.i18n.prop("job-monitor-port-range-limit"),
callback: function(value, validator) {
var monitorPort = parseInt(validator.getFieldElements("monitorPort").val(), 10);
if ((monitorPort >= 1000 && monitorPort <= 65535) || monitorPort === -1) {
if (monitorPort <= 65535) {
validator.updateStatus("monitorPort", "VALID");
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion elastic-job-lite/elastic-job-lite-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.dangdang</groupId>
<artifactId>elastic-job-lite</artifactId>
<version>2.1.5-SNAPSHOT</version>
<version>2.1.6-SNAPSHOT</version>
</parent>
<artifactId>elastic-job-lite-core</artifactId>
<name>${project.artifactId}</name>
Expand Down
2 changes: 1 addition & 1 deletion elastic-job-lite/elastic-job-lite-lifecycle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>elastic-job-lite</artifactId>
<groupId>com.dangdang</groupId>
<version>2.1.5-SNAPSHOT</version>
<version>2.1.6-SNAPSHOT</version>
</parent>
<artifactId>elastic-job-lite-lifecycle</artifactId>
<name>${project.artifactId}</name>
Expand Down
2 changes: 1 addition & 1 deletion elastic-job-lite/elastic-job-lite-spring/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>com.dangdang</groupId>
<artifactId>elastic-job-lite</artifactId>
<version>2.1.5-SNAPSHOT</version>
<version>2.1.6-SNAPSHOT</version>
</parent>
<artifactId>elastic-job-lite-spring</artifactId>
<name>${project.artifactId}</name>
Expand Down
2 changes: 1 addition & 1 deletion elastic-job-lite/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>elastic-job</artifactId>
<groupId>com.dangdang</groupId>
<version>2.1.5-SNAPSHOT</version>
<version>2.1.6-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
<artifactId>elastic-job-lite</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.dangdang</groupId>
<artifactId>elastic-job</artifactId>
<version>2.1.5-SNAPSHOT</version>
<version>2.1.6-SNAPSHOT</version>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
<description>Elastic-Job - distributed scheduled job solution</description>
Expand Down