Merge branch 'master' into master

CHANGELOG.md

@@ -2,6 +2,35 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.0.4] 2020-03-13
+
+### Improvements
+
+- Add English UI for DM-portal
+- Add the ` --more` parameter in the `query-status` command to show complete replication status information
+
+### Bug fixes
+
+- Fix the issue that `resume-task` might fail to resume the replication task which is interrupted by the abnormal connection to the downstream TiDB server
+- Fix the issue that the online DDL operation cannot be properly replicated after a failed replication task is restarted because the online DDL meta information has been cleared after the DDL operation failure
+- Fix the issue that `query-error` might cause the DM-worker to panic after `start-task` goes into error
+- Fix the issue that the relay log file and `relay.meta` cannot be correctly recovered when restarting an abnormally stopped DM-worker process before `relay.meta` is successfully written
+
+### Action required
+
+- When upgrading from a previous version, note that you must upgrade all DM components (dmctl/DM-master/DM-worker) together
+
+### Detailed Bug Fixes and Changes
+
+- Add English UI for DM-portal [#480](https://github.com/pingcap/dm/pull/480)
+- Add the ` --more` parameter in the `query-status` command to show complete replication status information [#533](https://github.com/pingcap/dm/pull/533)
+- Fix the issue that `resume-task` might fail to resume the replication task which is interrupted by the abnormal connection to the downstream TiDB server [#436](https://github.com/pingcap/dm/pull/436)
+- Fix the issue that the online DDL operation cannot be properly replicated after a failed replication task is restarted because the online DDL meta information is cleared after the DDL operation failure [#465](https://github.com/pingcap/dm/pull/465)
+- Fix the issue that `query-error` might cause the DM-worker to panic after `start-task` goes into error [#519](https://github.com/pingcap/dm/pull/519)
+- Fix the issue that the relay log file and `relay.meta` cannot be correctly recovered when restarting an abnormally stopped DM-worker process before `relay.meta` is successfully written [#534](https://github.com/pingcap/dm/pull/534)
+- Fix the issue that the `value out of range` error might be reported when getting `server-id` from the upstream [#538](https://github.com/pingcap/dm/pull/538)
+- Fix the issue that when Prometheus is not configured DM-Ansible prints the wrong error message that DM-master is not configured [#438](https://github.com/pingcap/dm/pull/438)
+
 ## [1.0.3] 2019-12-13
 
 ### Improvements

pkg/utils/db.go

@@ -303,7 +303,7 @@ func GetServerID(db *sql.DB) (uint32, error) {
 		return 0, err
 	}
 
-	serverID, err := strconv.ParseInt(serverIDStr, 10, 32)
+	serverID, err := strconv.ParseUint(serverIDStr, 10, 32)
 	return uint32(serverID), terror.ErrInvalidServerID.Delegate(err, serverIDStr)
 }
 

pkg/utils/db_test.go

@@ -32,6 +32,9 @@ func (t *testUtilsSuite) TestGetAllServerID(c *C) {
 		}, {
 			2,
 			[]uint32{},
+		}, {
+			4294967295, // max server-id.
+			[]uint32{},
 		},
 	}