ctripcorp/zeus
1
1
Fork 0
mirror of https://github.com/ctripcorp/zeus.git synced 2024-09-22 00:26:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse source
This commit is contained in:
fanqq 2015-10-14 10:31:12 +08:00
parent bb856163e8
commit 42d84cd5d4
4 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/ctrip/zeus/executor/impl/TaskWorkerImpl.java
View file

@ -48,7 +48,7 @@ public class TaskWorkerImpl implements TaskWorker {
if (++initFailCount > 3){
workerSlbId = null;
}
logger.error("Can Not Found Slb by Local Ip. TaskExecutor is not working!");
logger.error("Can Not Found Slb by Local Ip. TaskExecutor is not working!Local Ip : "+S.getIp());
}
}
}

2
src/main/java/com/ctrip/zeus/service/task/impl/TaskServiceImpl.java
View file

@ -128,7 +128,7 @@ public class TaskServiceImpl implements TaskService {
@Override
public boolean taskCancel(Long taskId) throws Exception {
int i = taskDao.compareAndUpdate(new TaskDo().setId(taskId).setStatus(TaskStatus.FAIL).setExpectStatus(TaskStatus.PENDING),TaskEntity.UPDATESET_FULL);
int i = taskDao.compareAndUpdate(new TaskDo().setFailCause("Task Pending timeout.Task is canceled").setId(taskId).setStatus(TaskStatus.FAIL).setExpectStatus(TaskStatus.PENDING),TaskEntity.UPDATESET_FULL);
return i > 0 ;
}
}

9
src/main/resources/META-INF/dal/jdbc/core-codegen.xml
View file

@ -88,7 +88,6 @@
<var name="key-private-key" value-type="String" key-member="private-key" />
<primary-key name="PRIMARY" members="private_key" />
<index name="time idx" members="DataChange_LastTime ASC" />
<index name="idx_DataChange_LastTime" members="DataChange_LastTime ASC" />
<readsets>
<readset name="FULL" all="true" />
</readsets>
@ -129,7 +128,6 @@
<var name="key-id" value-type="int" key-member="id" />
<primary-key name="PRIMARY" members="id" />
<index name="time_idx" members="DataChange_LastTime ASC" />
<index name="idx_DataChange_LastTime" members="DataChange_LastTime ASC" />
<readsets>
<readset name="FULL" all="true" />
</readsets>
@ -171,7 +169,6 @@
<index name="role_idx" members="role_name ASC" />
<index name="res_idx" members="resource_name ASC" />
<index name="time_idx" members="DataChange_LastTime ASC" />
<index name="idx_DataChange_LastTime" members="DataChange_LastTime ASC" />
<readsets>
<readset name="FULL" all="true" />
</readsets>
@ -212,7 +209,6 @@
<primary-key name="PRIMARY" members="id" />
<index name="role_idx" unique="true" members="role_name ASC" />
<index name="time_idx" members="DataChange_LastTime ASC" />
<index name="idx_DataChange_LastTime" members="DataChange_LastTime ASC" />
<readsets>
<readset name="FULL" all="true" />
</readsets>
@ -253,7 +249,6 @@
<primary-key name="PRIMARY" members="id" />
<index name="usr_name_idx" unique="true" members="user_name ASC" />
<index name="time_idx" members="DataChange_LastTime ASC" />
<index name="idx_DataChange_LastTime" members="DataChange_LastTime ASC" />
<readsets>
<readset name="FULL" all="true" />
</readsets>
@ -295,7 +290,6 @@
<primary-key name="PRIMARY" members="id" />
<index name="usr_idx" members="user_name ASC" />
<index name="time_idx" members="DataChange_LastTime ASC" />
<index name="idx_DataChange_LastTime" members="DataChange_LastTime ASC" />
<readsets>
<readset name="FULL" all="true" />
</readsets>
@ -835,6 +829,7 @@
<primary-key name="PRIMARY" members="id" />
<index name="slb_virtual_server_id_version" unique="true" members="slb_virtual_server_id ASC, version ASC" />
<index name="idx_DataChange_LastTime" members="DataChange_LastTime ASC" />
<index name="idx_slb_id_virtual_server_id_version" members="slb_id ASC, slb_virtual_server_id ASC, version ASC" />
<readsets>
<readset name="FULL" all="true" />
</readsets>
@ -877,6 +872,7 @@
<primary-key name="PRIMARY" members="id" />
<index name="slb_virtual_server_id_version" unique="true" members="slb_virtual_server_id ASC, version ASC" />
<index name="idx_DataChange_LastTime" members="DataChange_LastTime ASC" />
<index name="idx_slb_id_virtual_server_id_version" members="slb_id ASC, slb_virtual_server_id ASC, version ASC" />
<readsets>
<readset name="FULL" all="true" />
</readsets>
@ -963,6 +959,7 @@
<var name="key-id" value-type="long" key-member="id" />
<primary-key name="PRIMARY" members="id" />
<index name="DataChange_LastTime" members="DataChange_LastTime ASC" />
<index name="idx_datetime" members="datetime ASC" />
<readsets>
<readset name="FULL" all="true" />
</readsets>

4
src/main/resources/META-INF/dal/jdbc/core-task.xml
View file

@ -40,12 +40,14 @@
</query>
<query name="compare-and-update" type="UPDATE">
<param name="status"/>
<param name="fail-cause"/>
<param name="id"/>
<param name="expect-status"/>
<statement>
<![CDATA[
UPDATE <TABLE/>
SET <FIELD name='status'/> = ${status}
SET <FIELD name='status'/> = ${status},
<FIELD name='fail-cause'/> = ${fail-cause}
WHERE <FIELD name='id'/> = ${id}
AND <FIELD name='status'/> = ${expect-status}
]]>