chenjl/canal
1
0
Fork 0
mirror of https://github.com/alibaba/canal.git synced 2026-11-04 00:30:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #25 from alibaba/master

Browse Source 
merge
This commit is contained in:
rewerma
2018-12-03 17:55:32 +08:00
committed by GitHub
parent 339ecdd817 19e164b599
commit dac642f744
4 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
deployer/src/main/resources/metrics/Canal_instances_tmpl.json
View File

@@ -826,7 +826,7 @@
"bars": false, "bars": false,
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": "${DS_PROMETHEUS}", "datasource": "$datasource",
"description": "client 请求的GET与ACK包的QPS。", "description": "client 请求的GET与ACK包的QPS。",
"fill": 1, "fill": 1,
"gridPos": { "gridPos": {

9
docker/build.sh
View File

@@ -19,11 +19,6 @@ if [ "$1" == "base" ] ; then
else else
rm -rf $BASE/canal.*.tar.gz ; rm -rf $BASE/canal.*.tar.gz ;
cd $BASE/../ && mvn clean package -Dmaven.test.skip -Denv=release && cd $current_path ; cd $BASE/../ && mvn clean package -Dmaven.test.skip -Denv=release && cd $current_path ;
if [ "$1" == "kafka" ] ; then cp $BASE/../target/canal.deployer-*.tar.gz $BASE/
cp $BASE/../target/canal-kafka-*.tar.gz $BASE/ docker build --no-cache -t canal/canal-server $BASE/
docker build --no-cache -t canal/canal-server $BASE/
else
cp $BASE/../target/canal.deployer-*.tar.gz $BASE/
docker build --no-cache -t canal/canal-server $BASE/
fi
fi fi

2
docker/run.sh
View File

@@ -87,6 +87,6 @@ done
MEMORY="-m 4096m" MEMORY="-m 4096m"
LOCALHOST=`getMyIp` LOCALHOST=`getMyIp`
cmd="docker run -it -h $LOCALHOST $CONFIG --name=canal-server $VOLUMNS $NET_MODE $PORTS $MEMORY canal/canal-server" cmd="docker run -d -it -h $LOCALHOST $CONFIG --name=canal-server $VOLUMNS $NET_MODE $PORTS $MEMORY canal/canal-server"
echo $cmd echo $cmd
eval $cmd eval $cmd

7
parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/DatabaseTableMeta.java
View File

@@ -529,9 +529,10 @@ public class DatabaseTableMeta implements TableMetaTSDB {
return false; return false;
} }
if (!StringUtils.equalsIgnoreCase(sourceField.getDefaultValue(), targetField.getDefaultValue())) { // if (!StringUtils.equalsIgnoreCase(sourceField.getDefaultValue(),
return false; // targetField.getDefaultValue())) {
} // return false;
// }
if (sourceField.isNullable() != targetField.isNullable()) { if (sourceField.isNullable() != targetField.isNullable()) {
return false; return false;