diff options
| author | Binbin <binloveplay1314@qq.com> | 2022-02-20 13:11:20 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-19 21:11:20 -0800 |
| commit | c0ea77f0e19441f54e7303641b9387d281c2c3db (patch) | |
| tree | 6cc2c4a69ba85e1b769e828f7ad63200635dc4b8 | |
| parent | 56fa48ffc136b7540f8144562d8aa2a13b8a3fa7 (diff) | |
| download | redis-c0ea77f0e19441f54e7303641b9387d281c2c3db.tar.gz | |
Show publishshard_sent stat in cluster info (#10314)
publishshard was added in #8621 (7.0 RC1), but the publishshard_sent
stat is not shown in CLUSTER INFO command.
Other changes:
1. Remove useless `needhelp` statements, it was removed in 3dad819.
2. Use `LL_WARNING` log level for some error logs (I/O error, Connection failed).
3. Fix typos that saw by the way.
| -rw-r--r-- | redis.conf | 2 | ||||
| -rw-r--r-- | src/cluster.c | 4 | ||||
| -rw-r--r-- | src/cluster.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/redis.conf b/redis.conf index d9644a776..d018c8824 100644 --- a/redis.conf +++ b/redis.conf @@ -1680,7 +1680,7 @@ aof-timestamp-enabled no # routing. By default this value is only shown as additional metadata in the CLUSTER SLOTS # command, but can be changed using 'cluster-preferred-endpoint-type' config. This value is # communicated along the clusterbus to all nodes, setting it to an empty string will remove -# the hostname and also propgate the removal. +# the hostname and also propagate the removal. # # cluster-announce-hostname "" diff --git a/src/cluster.c b/src/cluster.c index 72438837a..d1626117c 100644 --- a/src/cluster.c +++ b/src/cluster.c @@ -106,7 +106,7 @@ dictType clusterNodesDictType = { }; /* Cluster re-addition blacklist. This maps node IDs to the time - * we can re-add this node. The goal is to avoid readding a removed + * we can re-add this node. The goal is to avoid reading a removed * node for some time. */ dictType clusterNodesBlackListDictType = { dictSdsCaseHash, /* hash function */ @@ -5283,7 +5283,7 @@ NULL addReplySds(c,reply); } else if (!strcasecmp(c->argv[1]->ptr,"info") && c->argc == 2) { /* CLUSTER INFO */ - char *statestr[] = {"ok","fail","needhelp"}; + char *statestr[] = {"ok","fail"}; int slots_assigned = 0, slots_ok = 0, slots_pfail = 0, slots_fail = 0; uint64_t myepoch; int j; diff --git a/src/cluster.h b/src/cluster.h index 7e0d7c25a..314b747be 100644 --- a/src/cluster.h +++ b/src/cluster.h @@ -96,8 +96,8 @@ typedef struct clusterLink { #define CLUSTERMSG_TYPE_UPDATE 7 /* Another node slots configuration */ #define CLUSTERMSG_TYPE_MFSTART 8 /* Pause clients for manual failover */ #define CLUSTERMSG_TYPE_MODULE 9 /* Module cluster API message. */ -#define CLUSTERMSG_TYPE_COUNT 10 /* Total number of message types. */ -#define CLUSTERMSG_TYPE_PUBLISHSHARD 11 /* Pub/Sub Publish shard propagation */ +#define CLUSTERMSG_TYPE_PUBLISHSHARD 10 /* Pub/Sub Publish shard propagation */ +#define CLUSTERMSG_TYPE_COUNT 11 /* Total number of message types. */ /* Flags that a module can set in order to prevent certain Redis Cluster * features to be enabled. Useful when implementing a different distributed |