mirrors
/
redis
mirror of https://mirror.osredm.com/root/redis.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
10,363 Commits 92 Branches 328 Tags 471 MiB
Commit Graph

438 Commits

Author SHA1 Message Date
Yossi Gottlieb d9f970d8d3
TLS: Add missing redis-cli options. (#7456) 
* Tests: fix and reintroduce redis-cli tests.

These tests have been broken and disabled for 10 years now!

* TLS: add remaining redis-cli support.

This adds support for the redis-cli --pipe, --rdb and --replica options
previously unsupported in --tls mode.

* Fix writeConn().
 2020-07-10 10:25:55 +03:00
Oran Agra b23e251036 redis-cli --hotkeys fixed to handle non-printable key names 2020-07-10 10:07:47 +03:00
Oran Agra 6f8a8647de redis-cli --bigkeys fixed to handle non-printable key names 2020-07-10 10:07:47 +03:00
Benjamin Sergeant f4d2abd3df do not handle --cluster-yes for cluster fix mode 2020-05-14 15:29:06 -07:00
Benjamin Sergeant db39b04d76 fix typo ... 2020-05-13 09:32:27 -07:00
Benjamin Sergeant 827e6cc644
Redis-cli 6.0.1 `--cluster-yes` doesn't work (fix #7246) 
This make it so that all prompts for all redis-cli --cluster commands are automatically answered with a yes.
 2020-05-13 09:24:51 -07:00
Benjamin Sergeant 93021da221
Update redis-cli.c 2020-05-01 20:57:51 -07:00
antirez 684c5907dd redis-cli: fix hints with subcommands. 2020-04-30 13:42:25 +02:00
antirez 551fed3169 redis-cli: safer cluster fix with unreachalbe masters. 2020-04-29 16:57:06 +02:00
antirez 7c29c9eec1 redis-cli: simplify cluster nodes coverage display. 2020-04-29 16:33:47 +02:00
antirez 86a1386d6f redis-cli: try to make clusterManagerFixOpenSlot() more readable. 
Also improve the message to make clear that there is no *clear* owner,
not that there is no owner at all.
 2020-04-29 12:37:47 +02:00
Salvatore Sanfilippo b9e5be5f56
Merge pull request #7005 from hwware/memoryleakfix-redis-cli 
fix potential memory leak in redis-cli lua debug mode
 2020-03-23 11:14:46 +01:00
hwware 86691ccff5 fix potentical memory leak in redis-cli 2020-03-18 09:33:52 -04:00
artix 771df8a436 Support Redis Cluster Proxy PROXY INFO command 2020-03-16 16:15:02 +01:00
antirez 453e01a091 Restore newline at the end of redis-cli.c 2020-03-13 16:21:55 +01:00
lifubang 1b72f4b749 add askpass mode 
Signed-off-by: lifubang <lifubang@acmcoder.com>
 2020-03-05 18:17:32 +08:00
Salvatore Sanfilippo f88f8661ac
Merge pull request #6804 from qetu3790/unstable 
Fix not used constant in lru_test_mode.
 2020-03-02 17:43:36 +01:00
lifubang dc8f947d7c correct help info for --user and --pass 
Signed-off-by: lifubang <lifubang@acmcoder.com>
 2020-02-12 16:34:22 +08:00
lifubang 540b917a26 fix ssl flag check for redis-cli 
Signed-off-by: lifubang <lifubang@acmcoder.com>
 2020-02-04 17:32:30 +08:00
Yossi Gottlieb 93edb3ff3a TLS: Fix missing initialization in redis-cli. 2020-01-29 21:40:02 +02:00
qetu3790 bd60c11bd8
Fix not used constant in lru_test_mode. 
LRU_CYCLE_PERIOD is defined,but not used.
 2020-01-23 17:18:07 +08:00
antirez d7a87d0ea4 redis-cli: some refactoring about not logging AUTH & co. 2019-12-12 09:40:36 +01:00
Itamar Haber 9f32d0eed2 Ommits from redis-cli's history 2019-10-31 15:45:52 +02:00
happynote3966 cd02c5944f fix comment typo in redis-cli.c 2019-10-25 22:31:55 +09:00
Yossi Gottlieb 0db3b0a0ff Merge remote-tracking branch 'upstream/unstable' into tls 2019-10-16 17:08:07 +03:00
Yossi Gottlieb 0132189007 Fix compile warnings when BUILD_TLS=no. 2019-10-15 15:24:32 +03:00
Yossi Gottlieb d7f2681a0c TLS: Improve CA certifiate configuration options. 
This adds support for explicit configuration of a CA certs directory (in
addition to the previously supported bundle file).  For redis-cli, if no
explicit CA configuration is supplied the system-wide default
configuration will be adopted.
 2019-10-08 17:58:50 +03:00
Yossi Gottlieb b087dd1db6 TLS: Connections refactoring and TLS support. 
* Introduce a connection abstraction layer for all socket operations and
integrate it across the code base.
* Provide an optional TLS connections implementation based on OpenSSL.
* Pull a newer version of hiredis with TLS support.
* Tests, redis-cli updates for TLS support.
 2019-10-07 21:06:13 +03:00
Salvatore Sanfilippo 2478b47b89
Merge pull request #6304 from dbenders/fix-issue-6141 
Fix issue #6141: cluster rebalance does not support binary key
 2019-09-30 17:43:58 +02:00
antirez eda703ab28 redis-cli: support for ACL style user/pass AUTH. 2019-09-23 19:57:13 +02:00
antirez b21dd082c3 redis-cli: CSV and RAW target for more RESP3 types. 2019-09-23 19:36:06 +02:00
antirez cc108057ff redis-cli: ability to start a session in RESP3 mode. 2019-09-23 17:55:05 +02:00
antirez 8ea185ea30 redis-cli: AUTH can now have 3 arguments as well. 2019-09-23 17:47:36 +02:00
antirez bb7546c913 RESP3: varbatim handling for other redis-cli outputs. 2019-09-23 17:42:57 +02:00
antirez 264708427b RESP3: implementation of verbatim output with TTY target. 2019-09-23 17:39:42 +02:00
antirez 12c56a8e75 redis-cli: always report server errors on read errors. 
Before this commit we may have not consumer buffers when a read error is
encountered. Such buffers may contain errors that are important clues
for the user: for instance a protocol error in the payload we send in
pipe mode will cause the server to abort the connection. If the user
does not get the protocol error, debugging what is happening can be a
nightmare.

This commit fixes issue #3756.
 2019-09-04 17:55:46 +02:00
Diego Bendersky b27f388344 pass len to alloc in clusterManagerMigrateKeysInReply 2019-08-05 17:35:50 -03:00
Salvatore Sanfilippo 53d1dc170c
Merge pull request #5921 from vattezhang/unstable_temp 
fix: fix the if condition in clusterManagerShowClusterInfo
 2019-03-13 12:18:08 +01:00
Salvatore Sanfilippo 02dab20026
Merge pull request #5894 from soloestoy/fix-rdb-warning 
Fix compile some warnings
 2019-03-13 11:47:48 +01:00
zhaozhao.zz 5a3d3d8be4 Fix compile warning in redis-cli.c 2019-03-13 16:54:34 +08:00
Salvatore Sanfilippo fba6e26e87
Merge pull request #5913 from wurongxin1987/unstable 
fix a bufferoverflow bug
 2019-03-12 17:25:21 +01:00
vattezhang bdc783b472 fix: fix the if condition in clusterManagerShowClusterInfo 2019-03-12 22:01:02 +08:00
wurongxin 0298d3ad18 fix a bufferoverflow bug 2019-03-10 15:30:32 +08:00
artix 93e51239ce Cluster Manager: add importing/migrating nodes to backup info 2019-03-06 16:38:36 +01:00
artix e6156a39bd Cluster Manager backup: remove --cluster-ignore-issue option 
Always save the backup, even if there are problems in the cluster.
Just display a warn message and save "cluster_errors" property
inside the json.
 2019-03-01 17:41:40 +01:00
artix 5e4dfc5c97 Cluster Manager: check cluster before backup 
- Prevent cluster backup if cluster has issues and needs to be fixed.
  This behaviour can be overridden by adding the option
  '--cluster-ignore-issues'
 2019-03-01 17:41:40 +01:00
artix fb020ab090 Cluster Manager: 'backup' command 2019-03-01 17:41:40 +01:00
artix 6cd64c6a98 Cluster Manager: change join issue message 2019-02-28 16:57:57 +01:00
artix 23ad3faa50 Cluster Manager: change text alert clusterManagerWaitForClusterJoin 2019-02-28 16:57:57 +01:00
artix 2593fb9c0c Cluster Manager: code cleanup 2019-02-28 16:57:57 +01:00
artix 6e9864fe0d Cluster Manager: fix bus error in clusterManagerGetLinkStatus 2019-02-28 16:57:57 +01:00
Artix 121adc604b Cluster Manager: fix memory leaks in clusterManagerGetDisconnectedLinks 2019-02-28 16:57:57 +01:00
artix b013d2c4db Cluster Manager: fix memory leak in clusterManagerWaitForClusterJoin 2019-02-28 16:57:57 +01:00
artix 3578aabc05 Cluster Manager: improve join issue checking 2019-02-28 16:57:57 +01:00
artix 2f499304aa Cluster Manager: check for unreachable nodes during cluster join. 2019-02-28 16:57:57 +01:00
Salvatore Sanfilippo 2d3cad684c
Merge pull request #5850 from artix75/dev 
Cluster Manager: fix replica assignment anti-affinity (create)
 2019-02-22 10:28:31 +01:00
Salvatore Sanfilippo 967a98f570
Merge pull request #4811 from oranagra/cli-diskless-repl 
Add redis-cli support for diskless replication (CAPA EOF)
 2019-02-21 12:54:15 +01:00
Oran Agra b6de51206e redis-cli add support for --memkeys, fix --bigkeys for module types 
* bigkeys used to fail on databases with module type keys
* new code adds more types when it discovers them, but has no way to know element count in modules types yet
* bigkeys was missing XLEN command for streams
* adding --memkeys and --memkeys-samples to make use of the MEMORY USAGE command

see #5167, #5175
 2019-02-21 12:18:20 +02:00
artix 0f28754021 Cluster Manager: fix replica assigment anti-affinity (create) 
Fix issue #5849
 2019-02-20 15:36:15 +01:00
artix 9fb160b130 Cluster Manager: remove unused code elements 2019-01-24 17:29:44 +01:00
Salvatore Sanfilippo 94460440b7
Merge pull request #5743 from AngusP/forever-repeat-cli 
Redis CLI: Fix broken interval and repeat behaviour (incluing in cluster mode)
 2019-01-22 17:29:37 +01:00
Zhicheng Wei c90cf3d82f fix clusterManagerGetAntiAffinityScore double free otypes 2019-01-19 11:38:36 +08:00
antirez 7d4b600f5d RESP3: redis-cli support for boolean in TTY output. 2019-01-09 17:00:30 +01:00
antirez 62b2642c51 RESP3: redis-cli: show the double as received from Redis. 2019-01-09 17:00:30 +01:00
antirez a2b2d88f38 RESP3: hiredis: initial double implementation. 2019-01-09 17:00:30 +01:00
antirez 005915b5c3 RESP3: hiredis: map and set display for TTY output. 2019-01-09 17:00:30 +01:00
Angus Pearson 2925bdc63b Add comment explaining negative repeat 2019-01-02 19:28:04 +00:00
Angus Pearson 2f6ed9333f Fix broken interval and repeat bahaviour in redis-cli (incluing cluster mode) 
This addresses two problems, one where infinite (negative) repeat count is broken for all types for Redis,
and another specific to cluster mode where redirection is needed.

Now allows and works correctly for negative (i.e. -1) repeat values passed with `-r` argument to redis-cli
as documented here https://redis.io/topics/rediscli#continuously-run-the-same-command which seems to have
regressed as a feature in 95b988 (though that commit removed bad integer wrap-around to `0` behaviour).

This broken behaviour exists currently (e50458), and redis-cli will just exit immediately with repeat `-r <= 0`
as opposed to send commands indefinitely as it should with `-r < 0`

Additionally prevents a repeat * interval seconds hang/time spent doing nothing at the start before issuing
commands in cluster mode (`-c`), where the command needed to redirect to a slot on another node, as commands
where failing and waiting to be reissued but this was fully repeated before being reissued. For example,

        redis-cli -c -r 10 -i 0.5 INCR test_key_not_on_6379

Would hang and show nothing for 5 seconds (10 * 0.5) before showing

        (integer) 1
        (integer) 2
        (integer) 3
        (integer) 4
        (integer) 5
        (integer) 6
        (integer) 7
        (integer) 8
        (integer) 9
        (integer) 10

at half second intervals as intended.
 2019-01-02 18:50:58 +00:00
artix 17797660f1 Cluster Manager del-node: use CLUSTER RESET in place of SHUTDOWN 
See issue #5687
 2018-12-27 17:20:42 +01:00
artix 503fd229e4 Cluster Manager: enable --cluster-replace also for 'fix' command. 2018-12-19 17:29:25 +01:00
artix cc29590188 Fixed memory leak in clusterManagerCompareKeysValues. 2018-12-18 18:45:10 +01:00
artix 143bfa1e6e Cluster Manager: compare key values after BUSYKEY error (migration). 
If a key exists in the target node during a migration (BUSYKEY),
the value of the key on both nodes (source and target) will be compared.
If the key has the same value on both keys, the migration will be
automatically retried with the REPLACE argument in order to override
the target's key.

If the key has different values, the behaviour will depend on such
cases:
- In case of 'fix' command, the migration will stop and the user
  will be warned to manually check the key(s).
- In other cases (ie. reshard), if the user launched the command
  with the --cluster-replace option, the migration will be
  retried with the REPLACE argument, elsewhere the migration will
  stop and the user will be warned.
 2018-12-18 17:45:35 +01:00
artix d935cfcb89 Cluster Manager: avoid using reply error messages to check slot status. 
Slot assignment status is now checked by using CLUSTER SLOTS.
Furthermore, one memory leak has been fixed.
 2018-12-12 13:34:43 +01:00
artix 27ddb2ba3a Cluster Manager: 
- Multiple owners checking in 'fix'/'check' commands is now
  optional (using --cluster-search-multiple-owners).
- Updated help.
 2018-12-10 18:01:18 +01:00
artix 0c1336caf4 Cluster Manager: 
- FixOpenSlot now correctly updates in-memory cluster configuration.
    - Improved output messages.
 2018-12-10 17:43:58 +01:00
artix 1a56fc913e Cluster Manager: 'fix' command now handles open slots with migrating state 
in one node and importing state in multiple nodes.
 2018-12-10 17:43:58 +01:00
artix d5f7703367 Cluster Manager: setting new slot owner is now handled atomically 
in 'fix' command.
 2018-12-10 17:43:58 +01:00
artix eaac9f9e93 Cluster Manager: code cleanup. 2018-12-10 17:43:58 +01:00
artix 5bf13eaaf8 Cluster Manager: check/fix commands now handle multiple owners even if 
all slots are covered and not open.
 2018-12-10 17:39:54 +01:00
yura 74f942cfa5 redis-cli reshard/rebalance: ability to force replacement on existing keys 2018-12-07 14:14:11 +03:00
Salvatore Sanfilippo 9f87ef9399
Merge pull request #5460 from krallin/env-password 
cli: pass auth through REDISCLI_AUTH
 2018-12-07 11:30:07 +01:00
yongman dfe81b33fe Fix cluster call reply format readable 2018-12-04 17:36:42 +08:00
yongman 221dfbd322 fix typo 2018-11-23 23:51:16 +08:00
yongman 2961c89161 Fix choose a random master node for slot assignment 2018-11-23 16:58:55 +08:00
yongman 2f76829dc7 skip slave nodes when sending cluster setslot command 2018-11-21 23:01:35 +08:00
yongman 64324901f2 Fix pointer access and memory leak in redis-cli. 2018-11-16 17:27:27 +08:00
Salvatore Sanfilippo d9e822a14b
Merge pull request #5529 from yongman/fix-rediscli-malloc 
fix zmalloc in clusterManagerComputeReshardTable
 2018-11-06 12:05:24 +01:00
yongman 4e74d9cf55 fix malloc in clusterManagerComputeReshardTable 2018-11-06 10:51:19 +08:00
artix 3a2d82ae8e Cluster Manager: removed unused var. 2018-11-05 14:19:45 +01:00
artix 18ddbf0352 Cluster Manager: further improvements to "fix": 
- clusterManagerFixOpenSlot: ensure that the
  slot is unassigned before ADDSLOTS
- clusterManagerFixSlotsCoverage: after cold
  migration, the slot configuration
  is now updated on all the nodes.
 2018-11-05 14:15:31 +01:00
artix d6f0a9ac72 Cluster Manager: fixed string parsing issue in clusterManagerGetConfigSignature 2018-11-05 14:15:22 +01:00
artix 2e9859cbfc Cluster Manager: better fix subcommand. 2018-11-05 14:15:12 +01:00
artix be3a9dbb6f Cluster Manager: fixed typos in comments. 2018-11-05 14:15:01 +01:00
artix ab270a9777 Cluster Manager: fixed 'DELSLOT' subcommand typo. 2018-11-05 14:14:45 +01:00
Thomas Orozco f24ad5d831 cli: pass auth through REDISCLI_AUTH 
This adds support for passing a password through a REDISCLI_AUTH
environment variable (which is safer than the CLI), which might often be
safer than passing it through a CLI argument.

Passing a password this way does not trigger the warning about passing a
password through CLI arguments, and CLI arguments take precedence over
it.
 2018-10-19 19:15:14 +02:00
artix 81c4be42c1 Cluster Manager: clusterManagerFixOpenSlot now counts node's keys in slot 
if node is neither migrating nor importing.
 2018-09-17 16:26:46 +02:00
antirez 9f43264f86 Revert "fix repeat argument issue and reduce unnessary loop times for redis-cli." 
Reverts commit 9505dd2011
since the commit introduced the very serious bug issue #5286.
 2018-09-17 16:24:07 +02:00
antirez 096c74c886 LOLWUT: show the output verbatim in redis-cli. 2018-09-11 16:29:31 +02:00
antirez 8296e5c846 Slave removal: slave mode -> replica mode text in redis-cli. 2018-09-11 15:32:28 +02:00
antirez f579b77449 Slave removal: redis-cli --slave -> --replica. 
--slave alias remains but is undocumented, just for backward
compatibiltiy.
 2018-09-11 15:32:28 +02:00