You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2018/07/31 20:43:57 UTC
[trafficserver] 09/11: Removes more references to traffic_cop and
cop related functionality
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit d02fd2b84b45db5652c3d28d52649486af51a90f
Author: Randall Meyer <rr...@apple.com>
AuthorDate: Mon Jul 30 13:01:07 2018 -0700
Removes more references to traffic_cop and cop related functionality
(cherry picked from commit 044f9d6e683ac0dbfadd3a4b3cbb25183e53eebc)
---
CMakeLists.txt | 1 -
doc/.tx/config | 5 ----
.../monitoring/statistics/core/general.en.rst | 3 ---
lib/records/Makefile.am | 7 +-----
mgmt/Cop.h | 27 ----------------------
mgmt/api/include/mgmtapi.h | 2 +-
src/traffic_ctl/config.cc | 5 ----
src/traffic_manager/traffic_manager.cc | 1 -
8 files changed, 2 insertions(+), 49 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f88c463..3f1ee4f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -484,7 +484,6 @@ add_executable(ats
mgmt/Alarms.h
mgmt/BaseManager.cc
mgmt/BaseManager.h
- mgmt/Cop.h
mgmt/FileManager.cc
mgmt/FileManager.h
mgmt/LocalManager.cc
diff --git a/doc/.tx/config b/doc/.tx/config
index 6be02f9..be18c3c 100644
--- a/doc/.tx/config
+++ b/doc/.tx/config
@@ -537,11 +537,6 @@ file_filter = locale/<lang>/LC_MESSAGES/appendices/command-line/index.en.po
source_file = _build/locale/pot/appendices/command-line/index.en.pot
source_lang = en
-[apache-traffic-server-6x.appendices--command-line--traffic_cop_en]
-file_filter = locale/<lang>/LC_MESSAGES/appendices/command-line/traffic_cop.en.po
-source_file = _build/locale/pot/appendices/command-line/traffic_cop.en.pot
-source_lang = en
-
[apache-traffic-server-6x.appendices--command-line--traffic_crashlog_en]
file_filter = locale/<lang>/LC_MESSAGES/appendices/command-line/traffic_crashlog.en.po
source_file = _build/locale/pot/appendices/command-line/traffic_crashlog.en.pot
diff --git a/doc/admin-guide/monitoring/statistics/core/general.en.rst b/doc/admin-guide/monitoring/statistics/core/general.en.rst
index 2b4c95d..7ead32c 100644
--- a/doc/admin-guide/monitoring/statistics/core/general.en.rst
+++ b/doc/admin-guide/monitoring/statistics/core/general.en.rst
@@ -31,9 +31,6 @@ General
.. ts:stat:: global proxy.node.config.reconfigure_time integer
-.. ts:stat:: global proxy.node.config.restart_required.cop integer
- :type: flag
-
.. ts:stat:: global proxy.node.config.restart_required.manager integer
:type: flag
diff --git a/lib/records/Makefile.am b/lib/records/Makefile.am
index 134c48d..d87515f 100644
--- a/lib/records/Makefile.am
+++ b/lib/records/Makefile.am
@@ -27,7 +27,7 @@ AM_CPPFLAGS += \
-I$(abs_top_srcdir)/lib \
$(TS_INCLUDES)
-noinst_LIBRARIES = librecords_lm.a librecords_p.a librecords_cop.a
+noinst_LIBRARIES = librecords_lm.a librecords_p.a
librecords_COMMON = \
I_RecAlarms.h \
@@ -66,10 +66,5 @@ librecords_p_a_SOURCES = \
P_RecProcess.h \
RecProcess.cc
-librecords_cop_a_SOURCES = \
- RecConfigParse.cc \
- RecFile.cc \
- RecDebug.cc
-
clang-tidy-local: $(sort $(DIST_SOURCES))
$(CXX_Clang_Tidy)
diff --git a/mgmt/Cop.h b/mgmt/Cop.h
deleted file mode 100644
index ed02db8..0000000
--- a/mgmt/Cop.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/** @file
-
- Main entry point for the traffic_cop application.
-
- @section license License
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-
-static const int cop_sleep_time = 10; // 10 sec
-static const int cop_manager_timeout = 3 * 60; // 3 min
-static const int cop_server_timeout = 3 * 60; // 3 min
-static const int cop_kill_timeout = 1 * 60; // 1 min
diff --git a/mgmt/api/include/mgmtapi.h b/mgmt/api/include/mgmtapi.h
index b9d87be..8fa22bc 100644
--- a/mgmt/api/include/mgmtapi.h
+++ b/mgmt/api/include/mgmtapi.h
@@ -98,7 +98,7 @@ typedef TSHandle TSIntList; /* contains int* 's */
/*--- basic control operations --------------------------------------------*/
typedef enum {
- TS_ACTION_SHUTDOWN, /* change requires user to stop then start the Traffic Server and Manager (restart Traffic Cop) */
+ TS_ACTION_SHUTDOWN, /* change requires user to stop then start the Traffic Server and Manager */
TS_ACTION_RESTART, /* change requires restart Traffic Server and Traffic Manager */
TS_ACTION_DYNAMIC, /* change is already made in function call */
TS_ACTION_RECONFIGURE, /* change requires TS to reread configuration files */
diff --git a/src/traffic_ctl/config.cc b/src/traffic_ctl/config.cc
index 42fdccc..14a7554 100644
--- a/src/traffic_ctl/config.cc
+++ b/src/traffic_ctl/config.cc
@@ -360,7 +360,6 @@ config_status(unsigned argc, const char **argv)
CtrlMgmtRecord reconfig;
CtrlMgmtRecord proxy;
CtrlMgmtRecord manager;
- CtrlMgmtRecord cop;
CTRL_MGMT_CHECK(version.fetch("proxy.process.version.server.long"));
CTRL_MGMT_CHECK(starttime.fetch("proxy.node.restarts.proxy.start_time"));
@@ -368,7 +367,6 @@ config_status(unsigned argc, const char **argv)
CTRL_MGMT_CHECK(reconfig.fetch("proxy.node.config.reconfigure_required"));
CTRL_MGMT_CHECK(proxy.fetch("proxy.node.config.restart_required.proxy"));
CTRL_MGMT_CHECK(manager.fetch("proxy.node.config.restart_required.manager"));
- CTRL_MGMT_CHECK(cop.fetch("proxy.node.config.restart_required.cop"));
printf("%s\n", CtrlMgmtRecordValue(version).c_str());
printf("Started at %s", timestr((time_t)starttime.as_int()).c_str());
@@ -381,9 +379,6 @@ config_status(unsigned argc, const char **argv)
if (manager.as_int()) {
printf("traffic_manager requires restarting\n");
}
- if (cop.as_int()) {
- printf("traffic_cop requires restarting\n");
- }
return CTRL_EX_OK;
}
diff --git a/src/traffic_manager/traffic_manager.cc b/src/traffic_manager/traffic_manager.cc
index e25a0b9..11794dd 100644
--- a/src/traffic_manager/traffic_manager.cc
+++ b/src/traffic_manager/traffic_manager.cc
@@ -705,7 +705,6 @@ main(int argc, const char **argv)
RecRegisterStatInt(RECT_NODE, "proxy.node.config.restart_required.proxy", 0, RECP_NON_PERSISTENT);
RecRegisterStatInt(RECT_NODE, "proxy.node.config.restart_required.manager", 0, RECP_NON_PERSISTENT);
- RecRegisterStatInt(RECT_NODE, "proxy.node.config.restart_required.cop", 0, RECP_NON_PERSISTENT);
RecRegisterStatInt(RECT_NODE, "proxy.node.config.draining", 0, RECP_NON_PERSISTENT);