More fixes for fmt 10.1.1

Author: ktf

src/StfSender/StfSenderOutput.cxx

@@ -497,7 +497,7 @@ void StfSenderOutput::StfSchedulerThread()
       }
       default:
       {
-        EDDLOG_RL(1000, "StfSchedulerThread: dropping STF of unknown type stf_source={}", lStf->header().mOrigin);
+        EDDLOG_RL(1000, "StfSchedulerThread: dropping STF of unknown type stf_source={}", std::string_view((char const*)lStf->header().mOrigin, 4));
         mDropQueue.push(std::move(lStf));
         continue;
         break;

src/TfBuilder/TfBuilderInputUCX.cxx

@@ -115,7 +115,7 @@ void TfBuilderInputUCX::new_conn_handle(ucp_conn_request_h conn_request)
   DDDLOG("Received a connection request! addr={} port={}", lStfSenderAddr, lStfSenderPort);
 
   if (mState.load() != CONFIGURING) {
-    EDDLOG("Received a connection request but not in CONFIGURING state. state={}", mState.load());
+    EDDLOG("Received a connection request but not in CONFIGURING state. state={}", (int)mState.load());
     return;
   }
 

src/TfBuilder/TfBuilderRpc.cxx

@@ -265,7 +265,7 @@ bool TfBuilderRpcImpl::sendTfBuilderUpdate()
   }
 
   sUpdateCnt++;
-  DDDLOG_RL(5000, "Sending TfBuilder update. accepting={} total={}", mAcceptingTfs, sUpdateCnt);
+  DDDLOG_RL(5000, "Sending TfBuilder update. accepting={} total={}", mAcceptingTfs.load(), sUpdateCnt);
 
   auto lRet = mTfSchedulerRpcClient.TfBuilderUpdate(lUpdate);
   if (!lRet && !mTerminateRequested && mRunning) {
@@ -391,7 +391,7 @@ ::grpc::Status TfBuilderRpcImpl::BuildTfRequest(::grpc::ServerContext* /*context
   assert (lTfId != 0);
 
   sNumTfRequests++;
-  DDDLOG_GRL(5000, "Requesting SubTimeFrames. tf_id={} tf_size={} total_requests={}", lTfId, lTfSize, sNumTfRequests);
+  DDDLOG_GRL(5000, "Requesting SubTimeFrames. tf_id={} tf_size={} total_requests={}", lTfId, lTfSize, sNumTfRequests.load());
 
   StfDataRequestMessage lStfRequest;
   const auto &lTfBuilderId = mDiscoveryConfig->status().info().process_id();
@@ -633,7 +633,7 @@ void TfBuilderRpcImpl::StfRequestGrpcThread()
 
     if (!lStatus.ok()) {
       EDDLOG("StfSender gRPC connection problem. stfs_id={} code={} error={} stf_size={} timeout={}",
-        lStfRequest.mRequest.stf_id(), lStfRequest.mStfSenderId, lStatus.error_code(), lStatus.error_message(), lStfRequest.mStfDataSize, (lStatus.error_code() == grpc::StatusCode::DEADLINE_EXCEEDED));
+             lStfRequest.mRequest.stf_id(), lStfRequest.mStfSenderId, (int)lStatus.error_code(), lStatus.error_message(), lStfRequest.mStfDataSize, (lStatus.error_code() == grpc::StatusCode::DEADLINE_EXCEEDED));
     } else if (lStfResponse.status() != StfDataResponse::OK) {
       EDDLOG("StfSender did not send data. stf_id={} stfs_id={} reason={}",
         lStfRequest.mStfSenderId, StfDataResponse_StfDataStatus_Name(lStfResponse.status()));

src/TfScheduler/TfSchedulerConnManager.cxx

@@ -355,7 +355,7 @@ void TfSchedulerConnManager::ConnectTfBuilderUCXThread(const std::string lStfSen
     const auto lGrpcStatus = mStfSenderRpcClients.ConnectTfBuilderUCXRequest(lStfSenderId, lParam, lResponse);
     if(!lGrpcStatus.ok()) {
       IDDLOG_RL(1000, "TfBuilder UCX Connection error: gRPC error when connecting StfSender. stfs_id={} tfb_id={} err_code={} err={}",
-        lStfSenderId, lTfBuilderId, lGrpcStatus.error_code(), lGrpcStatus.error_message());
+                lStfSenderId, lTfBuilderId, (int)lGrpcStatus.error_code(), lGrpcStatus.error_message());
       lConnectionsOk = false;
       break;
     }
@@ -523,7 +523,7 @@ void TfSchedulerConnManager::DropStfThread()
     if (!lStatus.ok()) {
       // gRPC problem...
       WDDLOG_GRL(1000, "StfSender gRPC connection error. stfs_id={} code={} error={}",
-        lStfSenderId, lStatus.error_code(), lStatus.error_message());
+                 lStfSenderId, (int)lStatus.error_code(), lStatus.error_message());
     }
 
     if (lStfResponse.status() == StfDataResponse::DATA_DROPPED_TIMEOUT) {

src/TfScheduler/TfSchedulerInstanceRpc.cxx

@@ -347,7 +347,7 @@ ::grpc::Status TfSchedulerInstanceRpcImpl::TfBuilderUpdate(::grpc::ServerContext
 
   sTfBuilderUpdates++;
   DDLOGF_GRL(30000, DataDistSeverity::debug, "gRPC server: TfBuilderUpdate. tfb_id={} total={}",
-    request->info().process_id(), sTfBuilderUpdates);
+             request->info().process_id(), sTfBuilderUpdates.load());
 
   mTfBuilderInfo.updateTfBuilderInfo(*request);
 
@@ -366,7 +366,7 @@ ::grpc::Status TfSchedulerInstanceRpcImpl::StfSenderStfUpdate(::grpc::ServerCont
 
   sStfUpdates++;
   DDLOGF_GRL(30000, DataDistSeverity::debug, "gRPC server: StfSenderStfUpdate. stfs_id={} total={}",
-    request->info().process_id(), sStfUpdates);
+             request->info().process_id(), sStfUpdates.load());
 
   response->Clear();
   mStfInfo.addStfInfo(*request, *response /*out*/);

src/TfScheduler/TfSchedulerStfInfo.cxx

@@ -207,7 +207,7 @@ void TfSchedulerStfInfo::StaleCleanupThread()
   mStaleStfTimeoutMs = std::clamp(mDiscoveryConfig->getUInt64Param(StaleTfTimeoutMsKey, StaleTfTimeoutMsDefault),
       std::uint64_t(250), std::uint64_t(60000));
 
-  IDDLOG("Parameter updated (consul) {}={}", StaleTfTimeoutMsKey, mStaleStfTimeoutMs);
+  IDDLOG("Parameter updated (consul) {}={}", StaleTfTimeoutMsKey, mStaleStfTimeoutMs.load());
 
   while (mRunning) {
 
@@ -217,7 +217,7 @@ void TfSchedulerStfInfo::StaleCleanupThread()
       std::uint64_t(25), std::uint64_t(60000));
     if (lStaleStfTimeoutMs != mStaleStfTimeoutMs) {
       mStaleStfTimeoutMs = lStaleStfTimeoutMs;
-      IDDLOG("Parameter updated (consul) {}={}", StaleTfTimeoutMsKey, mStaleStfTimeoutMs);
+      IDDLOG("Parameter updated (consul) {}={}", StaleTfTimeoutMsKey, mStaleStfTimeoutMs.load());
     }
 
     {

src/TfScheduler/TfSchedulerTfBuilderInfo.cxx

@@ -173,18 +173,18 @@ bool TfSchedulerTfBuilderInfo::findTfBuilderForTf(const std::uint64_t pSize, std
       DDMON("tfscheduler", "tf.rejected.no_tfb_inst", mNoTfBuilderAvailable);
 
       WDDLOG_RL(10000, "FindTfBuilder: TF cannot be scheduled. reason=NO_TFBUILDERS total={}",
-        mNoTfBuilderAvailable);
+                mNoTfBuilderAvailable.load());
 
     } else if (lMaxTfExceeded) {
       ++mTfNumExceeeded;
       WDDLOG_RL(10000, "FindTfBuilder: TF cannot be scheduled. reason=NUM_TF_EXCEEEDED total={} tf_size={} ready_tfb={}",
-        mTfNumExceeeded, lTfEstSize, mReadyTfBuilders.size());
+                mTfNumExceeeded.load(), lTfEstSize, mReadyTfBuilders.size());
       DDMON("tfscheduler", "tf.rejected.max_tf_exceeded", mTfNumExceeeded);
     } else if (lNoMemory) {
       ++mNoMemoryAvailable;
       DDMON("tfscheduler", "tf.rejected.no_tfb_buf", mNoMemoryAvailable);
       WDDLOG_RL(10000, "FindTfBuilder: TF cannot be scheduled. reason=NO_MEMORY total={} tf_size={} ready_tfb={}",
-        mNoMemoryAvailable, lTfEstSize, mReadyTfBuilders.size());
+                mNoMemoryAvailable.load(), lTfEstSize, mReadyTfBuilders.size());
     }
     return false;
   }

src/TfScheduler/TfSchedulerTfBuilderInfo.h

@@ -176,7 +176,7 @@ class TfSchedulerTfBuilderInfo
     const auto lNewVal = std::clamp(pMaxTfsInBuilding, std::size_t(1), std::size_t(512));
 
     if (mMaxTfsInBuilding != lNewVal) {
-      IDDLOG("Parameter Update: MaxTfsInBuilding old_value={} new_value={}", mMaxTfsInBuilding, lNewVal);
+      IDDLOG("Parameter Update: MaxTfsInBuilding old_value={} new_value={}", mMaxTfsInBuilding.load(), lNewVal);
       mMaxTfsInBuilding = lNewVal;
     }
   }

src/common/rpc/TfBuilderRpcClient.h

@@ -108,7 +108,7 @@ class TfBuilderRpcClientCtx {
       return true;
     }
 
-    EDDLOG_RL(1000, "gRPC request error. code={} message={}", lStatus.error_code(), lStatus.error_message());
+    EDDLOG_RL(1000, "gRPC request error. code={} message={}", (int)lStatus.error_code(), lStatus.error_message());
 
     return false;
   }