You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by br...@apache.org on 2015/05/19 04:47:16 UTC
[1/2] trafficserver git commit: TS-3618: Crashes in traffic_cop on
shutdown / restart
Repository: trafficserver
Updated Branches:
refs/heads/master 37569c139 -> 3ea9ccc30
TS-3618: Crashes in traffic_cop on shutdown / restart
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/591984cf
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/591984cf
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/591984cf
Branch: refs/heads/master
Commit: 591984cf0a288d0ac51c5d49fed7faf1f07d2a9f
Parents: 37569c1
Author: Brian Geffon <br...@apache.org>
Authored: Mon May 18 19:46:38 2015 -0700
Committer: Brian Geffon <br...@apache.org>
Committed: Mon May 18 19:46:38 2015 -0700
----------------------------------------------------------------------
cmd/traffic_cop/traffic_cop.cc | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/591984cf/cmd/traffic_cop/traffic_cop.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_cop/traffic_cop.cc b/cmd/traffic_cop/traffic_cop.cc
index 1a9ebad..a535cdf 100644
--- a/cmd/traffic_cop/traffic_cop.cc
+++ b/cmd/traffic_cop/traffic_cop.cc
@@ -81,6 +81,7 @@ static int coresig = 0;
static int debug_flag = false;
static int stdout_flag = false;
static int stop_flag = false;
+static volatile int sig_term_received = 0;
static char *admin_user;
static uid_t admin_uid;
@@ -271,7 +272,7 @@ sig_term(int signum)
child_status = status;
}
cop_log_trace("Leaving sig_term(%d), exiting traffic_cop\n", signum);
- exit(0);
+ sig_term_received = 1;
}
static void
@@ -828,7 +829,15 @@ poll_read_or_write(int fd, int timeout, int inorout)
info.revents = 0;
do {
+ if (sig_term_received) {
+ exit(0);
+ }
+
err = poll(&info, 1, timeout);
+
+ if (sig_term_received) {
+ exit(0);
+ }
} while ((err < 0) && (transient_error(errno, TRANSIENT_ERROR_WAIT_MS)));
if ((err > 0) && (info.revents & inorout)) {
[2/2] trafficserver git commit: TS-3618: Crashes in traffic_cop on
shutdown / restart: UPDATE CHANGES
Posted by br...@apache.org.
TS-3618: Crashes in traffic_cop on shutdown / restart: UPDATE CHANGES
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/3ea9ccc3
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/3ea9ccc3
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/3ea9ccc3
Branch: refs/heads/master
Commit: 3ea9ccc302557a308549fc23cb0d078cbcd9ec1d
Parents: 591984c
Author: Brian Geffon <br...@apache.org>
Authored: Mon May 18 19:47:03 2015 -0700
Committer: Brian Geffon <br...@apache.org>
Committed: Mon May 18 19:47:03 2015 -0700
----------------------------------------------------------------------
CHANGES | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3ea9ccc3/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 59a9b8e..fe2591f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 6.0.0
+ *) [TS-3618] Crashes in traffic_cop on shutdown / restart
+
*) [TS-3617] cache_promote leaks the URL string.
*) [TS-3581] Remove unused parameters from Cache::remove().