[03/22] git commit: TS-2246: cancel the trigger of CacheVC in openWriteCloseDataDone

[zw...@apache.org]

TS-2246: cancel the trigger of CacheVC in openWriteCloseDataDone


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/eea1066b
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/eea1066b
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/eea1066b

Branch: refs/heads/5.0.x
Commit: eea1066bc291bb2a6709c01c8801dd9203dc3fa9
Parents: eb4fef1
Author: weijin <ta...@taobao.com>
Authored: Tue Sep 24 17:26:23 2013 +0800
Committer: weijin <ta...@taobao.com>
Committed: Tue Sep 24 17:30:51 2013 +0800

----------------------------------------------------------------------
 CHANGES                    | 2 ++
 iocore/cache/CacheWrite.cc | 1 +
 2 files changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/eea1066b/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 510dc08..807545e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 4.1.0
 
+  *) TS-2245: cancel the trigger of CacheVC in openWriteCloseDataDone
+
   *) TS-2232: log level should be change from Status to Debug.
     Author: Yu Qing <zh...@taobao.com>
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/eea1066b/iocore/cache/CacheWrite.cc
----------------------------------------------------------------------
diff --git a/iocore/cache/CacheWrite.cc b/iocore/cache/CacheWrite.cc
index e133c27..210e84f 100644
--- a/iocore/cache/CacheWrite.cc
+++ b/iocore/cache/CacheWrite.cc
@@ -1208,6 +1208,7 @@ int
 CacheVC::openWriteCloseDataDone(int event, Event *e)
 {
   int ret = 0;
+  cancel_trigger();
 
   if (event == AIO_EVENT_DONE)
     set_io_not_in_progress();