[trafficserver] branch 9.0.x updated: Remove erroneous manager.log mesg with remap include file reload (#7646)

[zw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zwoop pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/9.0.x by this push:
     new edb00b0  Remove erroneous manager.log mesg with remap include file reload (#7646)
edb00b0 is described below

commit edb00b0ed5de5ab26c80e9e13cc750c597cef579
Author: Susan Hinrichs <sh...@verizonmedia.com>
AuthorDate: Mon Mar 29 17:07:55 2021 -0500

    Remove erroneous manager.log mesg with remap include file reload (#7646)
    
    (cherry picked from commit 6b28f19d2b863201f87ed31bc933998f26b55f5b)
    
     Conflicts:
    	tests/gold_tests/traffic_ctl/remap_inc/remap_inc.test.py
---
 mgmt/ConfigManager.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mgmt/ConfigManager.cc b/mgmt/ConfigManager.cc
index 19304e0..a34d6d9 100644
--- a/mgmt/ConfigManager.cc
+++ b/mgmt/ConfigManager.cc
@@ -117,7 +117,9 @@ ConfigManager::checkForUserUpdate(RollBackCheckType how)
   if (fileLastModified < TS_ARCHIVE_STAT_MTIME(fileInfo)) {
     if (how == ROLLBACK_CHECK_AND_UPDATE) {
       fileLastModified = TS_ARCHIVE_STAT_MTIME(fileInfo);
-      configFiles->fileChanged(fileName, configName);
+      if (!this->isChildManaged()) {
+        configFiles->fileChanged(fileName, configName);
+      }
       mgmt_log("User has changed config file %s\n", fileName);
     }
     result = true;