Merge pull request #6611 from chu11/issue6607_kvs_stats_clear_remove

kvs: remove stats clearing

Author: mergify[bot]

src/modules/kvs/kvs.c

@@ -221,17 +221,12 @@ static int event_subscribe (struct kvs_ctx *ctx, const char *ns)
      * See issue #2779 for more information.
      */
 
-    /* do not want to subscribe to events that are not within our
-     * namespace, so we subscribe to only specific ones.
-     */
-
     if (!(ctx->events_init)) {
 
         /* These belong to all namespaces, subscribe once the first
          * time we init a namespace */
 
-        if (flux_event_subscribe (ctx->h, "kvs.stats.clear") < 0
-            || flux_event_subscribe (ctx->h, "kvs.dropcache") < 0) {
+        if (flux_event_subscribe (ctx->h, "kvs.dropcache") < 0) {
             flux_log_error (ctx->h, "flux_event_subscribe");
             goto cleanup;
         }
@@ -2180,44 +2175,6 @@ static void stats_get_cb (flux_t *h,
     json_decref (nsstats);
 }
 
-static int stats_clear_root_cb (struct kvsroot *root, void *arg)
-{
-    kvstxn_mgr_clear_noop_stores (root->ktm);
-    return 0;
-}
-
-static void stats_clear (struct kvs_ctx *ctx)
-{
-    ctx->faults = 0;
-    memset (&ctx->txn_commit_stats, '\0', sizeof (ctx->txn_commit_stats));
-
-    if (kvsroot_mgr_iter_roots (ctx->krm, stats_clear_root_cb, NULL) < 0)
-        flux_log_error (ctx->h, "%s: kvsroot_mgr_iter_roots", __FUNCTION__);
-}
-
-static void stats_clear_event_cb (flux_t *h,
-                                  flux_msg_handler_t *mh,
-                                  const flux_msg_t *msg,
-                                  void *arg)
-{
-    struct kvs_ctx *ctx = arg;
-
-    stats_clear (ctx);
-}
-
-static void stats_clear_request_cb (flux_t *h,
-                                    flux_msg_handler_t *mh,
-                                    const flux_msg_t *msg,
-                                    void *arg)
-{
-    struct kvs_ctx *ctx = arg;
-
-    stats_clear (ctx);
-
-    if (flux_respond (h, msg, NULL) < 0)
-        flux_log_error (h, "%s: flux_respond", __FUNCTION__);
-}
-
 static int namespace_create (struct kvs_ctx *ctx,
                              const char *ns,
                              const char *rootref,
@@ -2625,18 +2582,6 @@ static const struct flux_msg_handler_spec htab[] = {
         stats_get_cb,
         FLUX_ROLE_USER
     },
-    {
-        FLUX_MSGTYPE_REQUEST,
-        "kvs.stats-clear",
-        stats_clear_request_cb,
-        0
-    },
-    {
-        FLUX_MSGTYPE_EVENT,
-        "kvs.stats-clear",
-        stats_clear_event_cb,
-        0
-    },
     {
         FLUX_MSGTYPE_EVENT,
         "kvs.namespace-*-setroot",

src/modules/kvs/kvstxn.c

@@ -1343,11 +1343,6 @@ int kvstxn_mgr_get_noop_stores (kvstxn_mgr_t *ktm)
     return ktm->noop_stores;
 }
 
-void kvstxn_mgr_clear_noop_stores (kvstxn_mgr_t *ktm)
-{
-    ktm->noop_stores = 0;
-}
-
 int kvstxn_mgr_ready_transaction_count (kvstxn_mgr_t *ktm)
 {
     return zlist_size (ktm->ready);

src/modules/kvs/kvstxn.h

@@ -201,7 +201,6 @@ void kvstxn_mgr_remove_transaction (kvstxn_mgr_t *ktm,
                                     bool fallback);
 
 int kvstxn_mgr_get_noop_stores (kvstxn_mgr_t *ktm);
-void kvstxn_mgr_clear_noop_stores (kvstxn_mgr_t *ktm);
 
 /* return count of ready transactions */
 int kvstxn_mgr_ready_transaction_count (kvstxn_mgr_t *ktm);

src/modules/kvs/test/kvstxn.c

@@ -228,8 +228,6 @@ void kvstxn_mgr_basic_tests (void)
     ok (kvstxn_mgr_get_noop_stores (ktm) == 0,
         "kvstxn_mgr_get_noop_stores works");
 
-    kvstxn_mgr_clear_noop_stores (ktm);
-
     ok (kvstxn_mgr_ready_transaction_count (ktm) == 0,
         "kvstxn_mgr_ready_transaction_count is initially 0");
 

t/t1001-kvs-internals.t

@@ -494,45 +494,6 @@ test_expect_success 'kvs: module stats returns reasonable transaction stats' '
         echo $commitdata | jq -e ".stddev >= 0.0"
 '
 
-#
-# test clear of stats
-#
-
-# each store of largeval will increase the noop store count, b/c we
-# know that the identical large value will be cached as raw data
-
-test_expect_success 'kvs: clear stats locally' '
-	flux kvs unlink -Rf $DIR &&
-	flux module stats -c kvs &&
-	flux module stats --parse "namespace.primary.#no-op stores" kvs | grep -q 0 &&
-	flux kvs put $DIR.largeval1=$largeval &&
-	flux kvs put $DIR.largeval2=$largeval &&
-	! flux module stats --parse "namespace.primary.#no-op stores" kvs | grep -q 0 &&
-	flux module stats -c kvs &&
-	flux module stats --parse "namespace.primary.#no-op stores" kvs | grep -q 0
-'
-
-test_expect_success 'kvs: clear of transaction stats works' '
-        commitdata=$(flux module stats -p transaction-opcount.commit kvs) &&
-        echo $commitdata | jq -e ".count == 0" &&
-        echo $commitdata | jq -e ".min == 0" &&
-        echo $commitdata | jq -e ".max == 0" &&
-        echo $commitdata | jq -e ".mean == 0.0" &&
-        echo $commitdata | jq -e ".stddev == 0.0"
-'
-
-test_expect_success NO_ASAN 'kvs: clear stats globally' '
-	flux kvs unlink -Rf $DIR &&
-	flux module stats -C kvs &&
-	flux exec -n sh -c "flux module stats --parse \"namespace.primary.#no-op stores\" kvs | grep -q 0" &&
-	for i in `seq 0 $((${SIZE} - 1))`; do
-	    flux exec -n -r $i sh -c "flux kvs put $DIR.$i.largeval1=$largeval $DIR.$i.largeval2=$largeval"
-	done &&
-	! flux exec -n sh -c "flux module stats --parse \"namespace.primary.#no-op stores\" kvs | grep -q 0" &&
-	flux module stats -C kvs &&
-	flux exec -n sh -c "flux module stats --parse \"namespace.primary.#no-op stores\" kvs | grep -q 0"
-'
-
 #
 # test ENOSYS on unfinished requests when unloading the KVS module
 #

t/t1005-kvs-security.t

@@ -397,12 +397,6 @@ test_expect_success 'kvs-watch: stats works (user)' '
         unset_userid
 '
 
-test_expect_success 'kvs: stats clear fails (user)' '
-        set_userid 9999 &&
-        ! flux module stats -c kvs &&
-        unset_userid
-'
-
 #
 # ensure no lingering pending requests
 #