[trafficserver] branch 9.2.x updated: s3_auth: Clear handling TSAction in the config_reloader (#10556)

[zwoop]

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

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


The following commit(s) were added to refs/heads/9.2.x by this push:
     new 4afda660e7 s3_auth: Clear handling TSAction in the config_reloader 
(#10556)
4afda660e7 is described below

commit 4afda660e72a755b59e38218bcdcbc40acb2f7ad
Author: Masaori Koshiba <masa...@apache.org>
AuthorDate: Mon Oct 16 08:03:54 2023 +0900

    s3_auth: Clear handling TSAction in the config_reloader (#10556)
    
    (cherry picked from commit baeaf9a07f627a463f6fcfc0df6e0ae19e31fd0e)
    
     Conflicts:
            plugins/s3_auth/s3_auth.cc
---
 plugins/s3_auth/s3_auth.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/s3_auth/s3_auth.cc b/plugins/s3_auth/s3_auth.cc
index b67c8cad11..52f56dea91 100644
--- a/plugins/s3_auth/s3_auth.cc
+++ b/plugins/s3_auth/s3_auth.cc
@@ -1050,7 +1050,9 @@ int
 config_reloader(TSCont cont, TSEvent event, void *edata)
 {
   TSDebug(PLUGIN_NAME, "reloading configs");
-  S3Config *s3          = static_cast<S3Config *>(TSContDataGet(cont));
+  S3Config *s3 = static_cast<S3Config *>(TSContDataGet(cont));
+  s3->check_current_action(edata);
+
   S3Config *file_config = gConfCache.get(s3->conf_fname());
 
   if (!file_config || !file_config->valid()) {
@@ -1061,7 +1063,6 @@ config_reloader(TSCont cont, TSEvent event, void *edata)
   {
     std::unique_lock lock(s3->reload_mutex);
     s3->copy_changes_from(file_config);
-    s3->check_current_action(edata);
   }
 
   if (s3->expiration() == 0) {