Cleanup: removing some traffic_manager leftovers.

doc/admin-guide/files/records.yaml.en.rst

@@ -267,36 +267,12 @@ System Variables
 
    The location of the |TS| ``bin`` directory.
 
-.. ts:cv:: CONFIG proxy.config.proxy_binary STRING traffic_server
-
- .. important::
-
-      This is now deprecated. traffic_manager is no longer supported.
-
-.. ts:cv:: CONFIG proxy.config.proxy_binary_opts STRING -M
-
-   .. important::
-
-      This is now deprecated
-
-.. ts:cv:: CONFIG proxy.config.manager_binary STRING traffic_manager
-
-   .. important::
-
-      This is now deprecated. traffic_manager is no longer supported.
-
 .. ts:cv:: CONFIG proxy.config.memory.max_usage INT 0
    :units: bytes
 
    Throttle incoming connections if resident memory usage exceeds this value.
    Setting the option to 0 disables the feature.
 
-.. ts:cv:: CONFIG proxy.config.env_prep STRING
-
-   .. important::
-
-      This is now deprecated. traffic_manager is no longer supported.
-
 .. ts:cv:: CONFIG proxy.config.syslog_facility STRING LOG_DAEMON
 
    The facility used to record system log files. Refer to
@@ -463,13 +439,6 @@ Thread Variables
    that :program:`traffic_server` crashes. ``-1`` means there is
    no limit. A value of ``0`` prevents core dump creation.
 
-.. ts:cv:: CONFIG proxy.config.restart.active_client_threshold INT 0
-   :reloadable:
-
-   .. important::
-
-      Deprecated. traffic_manager is no longer supported.
-
 .. ts:cv:: CONFIG proxy.config.restart.stop_listening INT 0
    :reloadable:
 
@@ -649,12 +618,6 @@ Network
 Management
 ==========
 
-.. ts:cv:: CONFIG proxy.node.config.manager_log_filename STRING manager.log
-
-   .. important::
-
-      This is now deprecated. traffic_manager is no longer supported.
-
 .. ts:cv:: CONFIG proxy.config.admin.user_id STRING nobody
 
    Designates the non-privileged account to run the :program:`traffic_server`

doc/admin-guide/monitoring/statistics/core/general.en.rst

@@ -31,11 +31,6 @@ General
 
 .. ts:stat:: global proxy.node.config.reconfigure_time integer
 
-.. ts:stat:: global proxy.node.config.restart_required.manager integer
-   :type: flag
-
-   This metric is now deprecated. traffic_manager is no longer supported.
-
 .. ts:stat:: global proxy.node.config.restart_required.proxy integer
    :type: flag
 
@@ -53,12 +48,6 @@ General
    Indicates whether any form of HTTP proxying is currently enabled in the
    running instance of |TS|.
 
-.. ts:stat:: global proxy.node.restarts.manager.start_time integer
-   :type: gauge
-   :units: seconds
-
-   This metric is now deprecated. traffic_manager is no longer supported.
-
 .. ts:stat:: global proxy.node.restarts.proxy.cache_ready_time integer
    :type: gauge
    :units: seconds

include/records/DynamicStats.h

@@ -35,7 +35,7 @@
      - supported: TSStatCreate, TSStatIntIncrement/TSStatIntDecrement, TSStatIntGet, TSStatIntSet, TSStatFindName
 
    CAVEAT: The librecords doesn't have APIs for "unregister stats" or "realloc rsb".
-   If you want to register ton of stats, bump -maxRecords option of traffic_manager/traffic_server.
+   If you want to register ton of stats, bump -maxRecords option of traffic_server.
 
  */
 class DynamicStats

include/tscore/ink_error.h

@@ -44,9 +44,6 @@
 // This magic exit code is used to signal that the crashing process cannot
 // be recovered from a restart of said process
 //
-// Originally, this was intended to be used as a backchannel mechanism whereby
-// traffic_server can tell traffic_manager via an exit code to stop trying to restart
-// traffic_server b/c (for example) traffic_server has a bad config file
 #define UNRECOVERABLE_EXIT 33
 
 void ink_emergency_va(const char *fmt, va_list ap) TS_NORETURN;

src/records/RecordsConfig.cc

@@ -53,8 +53,6 @@ static const RecordElement RecordsConfig[] =
   ,
   {RECT_CONFIG, "proxy.config.bin_path", RECD_STRING, TS_BUILD_BINDIR, RECU_NULL, RR_REQUIRED, RECC_NULL, nullptr, RECA_READ_ONLY}
   ,
-  {RECT_CONFIG, "proxy.config.env_prep", RECD_STRING, nullptr, RECU_NULL, RR_NULL, RECC_NULL, nullptr, RECA_NULL}
-  ,
   // Jira TS-21
   {RECT_CONFIG, "proxy.config.local_state_dir", RECD_STRING, TS_BUILD_RUNTIMEDIR, RECU_RESTART_TS, RR_NULL, RECC_NULL, nullptr, RECA_READ_ONLY}
   ,
@@ -123,8 +121,6 @@ static const RecordElement RecordsConfig[] =
   ,
   {RECT_CONFIG, "proxy.config.thread.default.stackguard_pages", RECD_INT, "1", RECU_RESTART_TS, RR_NULL, RECC_INT, "[1-256]", RECA_READ_ONLY}
   ,
-  {RECT_CONFIG, "proxy.config.restart.active_client_threshold", RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_NULL, nullptr, RECA_NULL}
-  ,
   {RECT_CONFIG, "proxy.config.restart.stop_listening", RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-1]", RECA_NULL}
   ,
   {RECT_CONFIG, "proxy.config.stop.shutdown_timeout", RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}

src/traffic_ctl/jsonrpc/CtrlRPCRequests.h

@@ -243,10 +243,9 @@ struct ConfigStatusRequest : shared::rpc::RecordLookupRequest {
   using super = shared::rpc::RecordLookupRequest;
   ConfigStatusRequest() : super()
   {
-    static const std::array<std::string, 6> statusFieldsNames = {
-      "proxy.process.version.server.long",        "proxy.node.restarts.proxy.start_time",
-      "proxy.node.config.reconfigure_time",       "proxy.node.config.reconfigure_required",
-      "proxy.node.config.restart_required.proxy", "proxy.node.config.restart_required.manager"};
+    static const std::array<std::string, 5> statusFieldsNames = {
+      "proxy.process.version.server.long", "proxy.node.restarts.proxy.start_time", "proxy.node.config.reconfigure_time",
+      "proxy.node.config.reconfigure_required", "proxy.node.config.restart_required.proxy"};
     for (auto &&recordName : statusFieldsNames) {
       super::emplace_rec(recordName, shared::rpc::NOT_REGEX, shared::rpc::METRIC_REC_TYPES);
     }

src/traffic_server/traffic_server.cc

@@ -1822,7 +1822,6 @@ main(int /* argc ATS_UNUSED */, const char **argv)
   RecRegisterStatInt(RECT_NODE, "proxy.node.config.reconfigure_time", time(nullptr), RECP_NON_PERSISTENT);
   RecRegisterStatInt(RECT_NODE, "proxy.node.config.reconfigure_required", 0, RECP_NON_PERSISTENT);
   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.draining", 0, RECP_NON_PERSISTENT);
   RecRegisterStatInt(RECT_NODE, "proxy.node.proxy_running", 1, RECP_NON_PERSISTENT);
   RecSetRecordInt("proxy.node.restarts.proxy.start_time", time(nullptr), REC_SOURCE_DEFAULT);

tests/gold_tests/logging/ts_process_handler.py

@@ -33,18 +33,12 @@ def __init__(self, message):
         super().__init__(self.message)
 
 
-def get_desired_process(ts_identifier, get_ppid=False):
+def get_ts_process_pid(ts_identifier):
+    processes = []
     for proc in psutil.process_iter(['cmdline']):
         commandline = ' '.join(proc.info['cmdline'])
         if '/traffic_server' in commandline and ts_identifier in commandline:
-            if not get_ppid:
-                return proc
-            parent = proc.parent()
-            with parent.oneshot():
-                if 'traffic_manager' not in parent.cmdline():
-                    raise GetPidError("Found a traffic server process, "
-                                      "but its parent is not traffic_manager")
-                return parent
+            return proc
     raise GetPidError("Could not find a traffic_server process")
 
 
@@ -88,17 +82,14 @@ def parse_args():
     parser.add_argument(
         '--signal',
         help='Send the given signal to the process.')
-    parser.add_argument(
-        '--parent', action="store_true", default=False,
-        help='Interact with the parent process of the Traffic Server process')
 
     return parser.parse_args()
 
 
 def main():
     args = parse_args()
     try:
-        process = get_desired_process(args.ts_identifier, args.parent)
+        process = get_ts_process_pid(args.ts_identifier)
     except GetPidError as e:
         print(traceback.format_exception(None, e, e.__traceback__),
               file=sys.stderr, flush=True)

tests/gold_tests/records/gold/full_records.yaml

@@ -471,7 +471,6 @@ ts:
   remote_sync_interval_ms: 5000
   res_track_memory: 0
   restart:
-    active_client_threshold: 0
     stop_listening: 0
   reverse_proxy:
     enabled: 1

tests/gold_tests/records/legacy_config/full_records.config

@@ -25,7 +25,6 @@ CONFIG proxy.config.accept_threads INT 1
 CONFIG proxy.config.task_threads INT 2
 CONFIG proxy.config.thread.default.stacksize INT 1048576
 CONFIG proxy.config.thread.default.stackguard_pages INT 1
-CONFIG proxy.config.restart.active_client_threshold INT 0
 CONFIG proxy.config.restart.stop_listening INT 0
 CONFIG proxy.config.stop.shutdown_timeout INT 0
 CONFIG proxy.config.thread.max_heartbeat_mseconds INT 60