int shutdown;
int monitor_mode;
int pubsub_mode;
+ int latency_mode;
+ int cluster_mode;
+ int cluster_reissue_command;
int stdinarg; /* get last arg from stdin. (-x option) */
char *auth;
int raw_output; /* output mode per command */
void *_reply;
redisReply *reply;
sds out;
+ int output = 1;
if (redisGetReply(context,&_reply) != REDIS_OK) {
if (config.shutdown)
}
reply = (redisReply*)_reply;
- if (output_raw_strings) {
- out = cliFormatReplyRaw(reply);
- } else {
- if (config.raw_output) {
+
+ /* Check if we need to connect to a different node and reissue the request. */
+ if (config.cluster_mode && reply->type == REDIS_REPLY_ERROR &&
+ (!strncmp(reply->str,"MOVED",5) || !strcmp(reply->str,"ASK")))
+ {
+ char *p = reply->str, *s;
+ int slot;
+
+ output = 0;
+ /* Comments show the position of the pointer as:
+ *
+ * [S] for pointer 's'
+ * [P] for pointer 'p'
+ */
+ s = strchr(p,' '); /* MOVED[S]3999 127.0.0.1:6381 */
+ p = strchr(s+1,' '); /* MOVED[S]3999[P]127.0.0.1:6381 */
+ *p = '\0';
+ slot = atoi(s+1);
+ s = strchr(p+1,':'); /* MOVED 3999[P]127.0.0.1[S]6381 */
+ *s = '\0';
+ sdsfree(config.hostip);
+ config.hostip = sdsnew(p+1);
+ config.hostport = atoi(s+1);
+ if (config.interactive)
+ printf("-> Redirected to slot [%d] located at %s:%d\n",
+ slot, config.hostip, config.hostport);
+ config.cluster_reissue_command = 1;
+ }
+
+ if (output) {
+ if (output_raw_strings) {
out = cliFormatReplyRaw(reply);
- out = sdscat(out,"\n");
} else {
- out = cliFormatReplyTTY(reply,"");
+ if (config.raw_output) {
+ out = cliFormatReplyRaw(reply);
+ out = sdscat(out,"\n");
+ } else {
+ out = cliFormatReplyTTY(reply,"");
+ }
}
+ fwrite(out,sdslen(out),1,stdout);
+ sdsfree(out);
}
- fwrite(out,sdslen(out),1,stdout);
- sdsfree(out);
freeReplyObject(reply);
return REDIS_OK;
}
i++;
} else if (!strcmp(argv[i],"--raw")) {
config.raw_output = 1;
+ } else if (!strcmp(argv[i],"--latency")) {
+ config.latency_mode = 1;
+ } else if (!strcmp(argv[i],"-c")) {
+ config.cluster_mode = 1;
} else if (!strcmp(argv[i],"-d") && !lastarg) {
sdsfree(config.mb_delim);
config.mb_delim = sdsnew(argv[i+1]);
" -n <db> Database number\n"
" -x Read last argument from STDIN\n"
" -d <delimiter> Multi-bulk delimiter in for raw formatting (default: \\n)\n"
+" -c Enable cluster mode (follow -ASK and -MOVED redirections)\n"
" --raw Use raw formatting for replies (default when STDOUT is not a tty)\n"
+" --latency Enter a special mode continuously sampling latency.\n"
" --help Output this help and exit\n"
" --version Output version and exit\n"
"\n"
int repeat, skipargs = 0;
repeat = atoi(argv[0]);
- if (repeat) {
+ if (argc > 1 && repeat) {
skipargs = 1;
} else {
repeat = 1;
}
- if (cliSendCommand(argc-skipargs,argv+skipargs,repeat)
- != REDIS_OK)
- {
- cliConnect(1);
-
- /* If we still cannot send the command print error.
- * We'll try to reconnect the next time. */
+ while (1) {
+ config.cluster_reissue_command = 0;
if (cliSendCommand(argc-skipargs,argv+skipargs,repeat)
!= REDIS_OK)
- cliPrintContextError();
+ {
+ cliConnect(1);
+
+ /* If we still cannot send the command print error.
+ * We'll try to reconnect the next time. */
+ if (cliSendCommand(argc-skipargs,argv+skipargs,repeat)
+ != REDIS_OK)
+ cliPrintContextError();
+ }
+ /* Issue the command again if we got redirected in cluster mode */
+ if (config.cluster_mode && config.cluster_reissue_command) {
+ cliConnect(1);
+ } else {
+ break;
+ }
}
elapsed = mstime()-start_time;
if (elapsed >= 500) {
return retval;
}
+static void latencyMode(void) {
+ redisReply *reply;
+ long long start, latency, min, max, tot, count = 0;
+ double avg;
+
+ if (!context) exit(1);
+ while(1) {
+ start = mstime();
+ reply = redisCommand(context,"PING");
+ if (reply == NULL) {
+ fprintf(stderr,"\nI/O error\n");
+ exit(1);
+ }
+ latency = mstime()-start;
+ freeReplyObject(reply);
+ count++;
+ if (count == 1) {
+ min = max = tot = latency;
+ avg = (double) latency;
+ } else {
+ if (latency < min) min = latency;
+ if (latency > max) max = latency;
+ tot += latency;
+ avg = (double) tot/count;
+ }
+ printf("\x1b[0G\x1b[2Kmin: %lld, max: %lld, avg: %.2f (%lld samples)",
+ min, max, avg, count);
+ fflush(stdout);
+ usleep(10000);
+ }
+}
+
int main(int argc, char **argv) {
int firstarg;
config.shutdown = 0;
config.monitor_mode = 0;
config.pubsub_mode = 0;
+ config.latency_mode = 0;
+ config.cluster_mode = 0;
config.stdinarg = 0;
config.auth = NULL;
config.raw_output = !isatty(fileno(stdout)) && (getenv("FAKETTY") == NULL);
argc -= firstarg;
argv += firstarg;
+ /* Start in latency mode if appropriate */
+ if (config.latency_mode) {
+ cliConnect(0);
+ latencyMode();
+ }
+
/* Start interactive mode when no command is provided */
if (argc == 0) {
/* Note that in repl mode we don't abort on connection error.
projects / redis.git / blobdiff