HPCC-29929 Remove some more useless roxie metrics

A few more that I left on first pass in case they were useful. They are not. Signed-off-by: Richard Chapman <[email protected]>
hpcc-systems · Jul 11, 2023 · 7ca3c0a · 7ca3c0a
1 parent c3db836
commit 7ca3c0a
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 33 deletions.
diff --git a/roxie/ccd/ccdfile.cpp b/roxie/ccd/ccdfile.cpp
@@ -1516,7 +1516,6 @@ class CRoxieFileCache : implements IRoxieFileCache, implements ICopyFileProgress
                         {
                             next.setown(popped);
                         }
-                        numFilesToProcess--;    // must decrement counter for SNMP accuracy
                     }
                 }
                 if (next)
@@ -1712,7 +1711,6 @@ class CRoxieFileCache : implements IRoxieFileCache, implements ICopyFileProgress
             if (file == &todo.item(idx))
             {
                 todo.remove(idx);
-                numFilesToProcess--;    // must decrement counter for SNMP accuracy
             }
         }
 #ifdef _CONTAINERIZED
@@ -1841,7 +1839,6 @@ class CRoxieFileCache : implements IRoxieFileCache, implements ICopyFileProgress
                             }
 
                             todo.append(*ret);
-                            numFilesToProcess++;  // must increment counter for SNMP accuracy
                             toCopy.signal();
                         }
                         else
@@ -1871,7 +1868,6 @@ class CRoxieFileCache : implements IRoxieFileCache, implements ICopyFileProgress
                             todo.add(*ret, 0);
                         else
                             todo.append(*ret);
-                        numFilesToProcess++;  // must increment counter for SNMP accuracy
                         toCopy.signal();
 #endif
 

diff --git a/roxie/ccd/ccdlistener.cpp b/roxie/ccd/ccdlistener.cpp
@@ -1237,7 +1237,6 @@ class RoxieWorkUnitWorker : public RoxieQueryWorker
         unsigned priority = (unsigned) -2;
         try
         {
-            queryCount++;
             bool isBlind = wu->getDebugValueBool("blindLogging", false);
             if (pool)
             {
@@ -1375,7 +1374,6 @@ class RoxieProtocolMsgContext : implements IHpccProtocolMsgContext, public CInte
     {
         ep.set(_ep);
         unknownQueryStats.noteActive();
-        queryCount++;
     }
     ~RoxieProtocolMsgContext()
     {

diff --git a/roxie/ccd/ccdqueue.cpp b/roxie/ccd/ccdqueue.cpp
@@ -1138,7 +1138,6 @@ class RoxieQueue : public CInterface, implements IThreadFactory
 
     void noteQueued()
     {
-        maxQueueLength.store_max(++queueLength);
         // NOTE - there is a small race condition here - if idle is 1 but two enqueue's happen
         // close enough together that the signal has not yet caused idle to come back down to zero, then the
         // desired new thread may not be created. It's unlikely, and it's benign in that the query is still
@@ -1291,7 +1290,6 @@ class RoxieQueue : public CInterface, implements IThreadFactory
             l.CTXLOG("discarded %s", header.toString(xx).str());
 #endif
             found->Release();
-            queueLength--;
             return true;
         }
         else
@@ -1729,8 +1727,6 @@ class CRoxieWorker : public CInterface, implements IPooledThread
                     queue->wait();
                     if (stopped)
                         break;
-                    agentsActive++;
-                    maxAgentsActive.store_max(agentsActive);
                     abortLaunch = false;
                     workerThreadBusy = true;
 #ifndef NEW_IBYTI
@@ -1747,7 +1743,6 @@ class CRoxieWorker : public CInterface, implements IPooledThread
 #endif
                         packet.setown(next->deserialize());
                         next.clear();
-                        queueLength--;
                         RoxiePacketHeader &header = packet->queryHeader();
 #ifndef SUBCHANNELS_IN_HEADER
                         topology.setown(getTopology());
@@ -1785,7 +1780,6 @@ class CRoxieWorker : public CInterface, implements IPooledThread
 #endif
                         logctx.set(NULL);
                     }
-                    agentsActive--;
                 }
             }
             catch(IException *E)

diff --git a/roxie/ccd/ccdsnmp.cpp b/roxie/ccd/ccdsnmp.cpp
@@ -31,20 +31,12 @@
 
 #define DEFAULT_PULSE_INTERVAL 30
 
-RelaxedAtomic<unsigned> queryCount;
 RoxieQueryStats unknownQueryStats;
 RoxieQueryStats loQueryStats;
 RoxieQueryStats hiQueryStats;
 RoxieQueryStats slaQueryStats;
 RoxieQueryStats combinedQueryStats;
 
-RelaxedAtomic<unsigned> numFilesToProcess;
-RelaxedAtomic<unsigned> queueLength;
-RelaxedAtomic<unsigned> maxQueueLength;
-
-RelaxedAtomic<unsigned> agentsActive;
-RelaxedAtomic<unsigned> maxAgentsActive;
-
 #define addMetric(a, b) doAddMetric(a, #a, b)
 
 interface INamedMetric : extends IInterface
@@ -296,15 +288,11 @@ using roxiemem::getDataBuffersActive;
 CRoxieMetricsManager::CRoxieMetricsManager()
 {
     started = false;
-    addMetric(maxQueueLength, 0);
-    addMetric(queryCount, 1000);
     unknownQueryStats.addMetrics(this, "unknown", 1000);
     loQueryStats.addMetrics(this, "lo", 1000);
     hiQueryStats.addMetrics(this, "hi", 1000);
     slaQueryStats.addMetrics(this, "sla", 1000);
     combinedQueryStats.addMetrics(this, "all", 1000);
-    addMetric(agentsActive, 0);
-    addMetric(maxAgentsActive, 0);
     addMetric(restarts, 0);
 
     addMetric(nodesLoaded, 1000);
@@ -335,8 +323,6 @@ CRoxieMetricsManager::CRoxieMetricsManager()
     addMetric(flowRequestsSent, 1000);
     addMetric(flowPermitsReceived, 1000);
     addMetric(dataPacketsSent, 1000);
-
-    addMetric(numFilesToProcess, 0);
     ticker.start();
 }
 

diff --git a/roxie/ccd/ccdsnmp.hpp b/roxie/ccd/ccdsnmp.hpp
@@ -78,19 +78,12 @@ extern IQueryStatsAggregator *createQueryStatsAggregator(const char *queryName,
 extern IPropertyTree *getAllQueryStats(bool includeQueries, bool rawStats, time_t from, time_t to);
 extern IPropertyTree *getQueryRawStats(const char *queryID, time_t from, time_t to);
 
-extern RelaxedAtomic<unsigned> queryCount;
 extern RoxieQueryStats unknownQueryStats;
 extern RoxieQueryStats loQueryStats;
 extern RoxieQueryStats hiQueryStats;
 extern RoxieQueryStats slaQueryStats;
 extern RoxieQueryStats combinedQueryStats;
 
-extern RelaxedAtomic<unsigned> maxAgentsActive;
-extern RelaxedAtomic<unsigned> agentsActive;
-extern RelaxedAtomic<unsigned> queueLength;
-extern RelaxedAtomic<unsigned> maxQueueLength;
-extern RelaxedAtomic<unsigned> numFilesToProcess;
-
 interface IRoxieMetricsManager : extends IInterface
 {
     virtual void dumpMetrics() = 0;