gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,804 Commits 1 Branch 0 Tags
Commit Graph

4804 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
antirez
68ee900138 Lua cmsgpack lib updated to latest version. 
It fixes a bad bug that crashes the server in certain conditions
as shown in issue #2210.
 2014-12-12 22:56:33 +01:00
antirez
070ec599ba sdsformatip() removed. 
Specialized single-use function. Not the best match for sds.c btw.
Also genClientPeerId() is no longer static: we need symbols.
 2014-12-11 18:29:04 +01:00
antirez
3d476bf2b6 AnetFormatIP(): renamed, commented, now sticks to IP:port format. 
A few code style changes + consistent format: not nice for humans but
better for parsers.
 2014-12-11 18:20:30 +01:00
Matt Stancliff
f7a98bdf4d Cleanup all IP formatting code 
Instead of manually checking for strchr(n,':') everywhere,
we can use our new centralized IP formatting functions.
 2014-12-11 10:12:18 -05:00
Matt Stancliff
89d35a3391 Add centralized IP/Peer formatting functions 
This stops us from needing to manually check against ":" to
add brackets around IPv6 addresses everywhere.
 2014-12-11 10:05:35 -05:00
antirez
7f1dabee0b SORT: Don't sort Set elements if not needed. 
Related to #2094.
 2014-12-11 15:57:23 +01:00
Salvatore Sanfilippo
55d0a99c09 Merge pull request #2094 from mattsta/nosort 
Fix zero-ordering SORT when called against lists
 2014-12-11 15:54:39 +01:00
Salvatore Sanfilippo
044fce926b Merge pull request #2103 from coderholic/unstable 
Update redis_init_script.tpl
 2014-12-11 15:20:53 +01:00
antirez
a6e2d5113f In redisIsSupervised() use MSG_NOSIGNAL only for Linux. 2014-12-11 15:19:23 +01:00
antirez
b11dbf8130 Removed useless space in redis-benchmark.c. 2014-12-11 15:16:20 +01:00
Salvatore Sanfilippo
1041c79bdb Merge pull request #2105 from Hailei/fix-redis-benchmark-idle-IDLE 
FIXED redis-benchmark's idle mode.With idle mode shouldn't create write event
 2014-12-11 15:11:22 +01:00
Salvatore Sanfilippo
02d1bafee7 Merge pull request #2106 from NanXiao/unstable 
Fix function prototype in redis-cli.c.
 2014-12-11 15:08:51 +01:00
Salvatore Sanfilippo
bf54f5f79e Merge pull request #2107 from mattsta/fix-trib-import 
Fix redis-trib import SCAN call
 2014-12-11 15:05:38 +01:00
Salvatore Sanfilippo
9fdcefe4bd Merge pull request #2114 from h0x91b/redis-cli-fix-cluster 
Reconnect redis-cli when cluster return "moved"
 2014-12-11 14:58:37 +01:00
Salvatore Sanfilippo
695d30eeb7 Merge pull request #2117 from mariano-perez-rodriguez/patch-4 
Typo fixes in redis.conf
 2014-12-11 14:40:18 +01:00
Salvatore Sanfilippo
eb82f97f6e Merge pull request #2134 from pyr/feature/supervised-init 
Support daemon supervision by upstart or systemd
 2014-12-11 14:39:09 +01:00
Pierre-Yves Ritschard
27aded68c7 Do not expect UPSTART_JOB to be redis 2014-12-10 21:36:53 +01:00
antirez
5b6e4e866d Better read-only behavior for expired keys in slaves. 
Slaves key expire is orchestrated by the master. Sometimes the master
will send the synthesized DEL to expire keys on the slave with a non
trivial delay (when the key is not accessed, only the incremental expiry
algorithm will expire it in background).

During that time, a key is logically expired, but slaves still return
the key if you GET (or whatever) it. This is a bad behavior.

However we can't simply trust the slave view of the key, since we need
the master to be able to send write commands to update the slave data
set, and DELs should only happen when the key is expired in the master
in order to ensure consistency.

However 99.99% of the issues with this behavior is when a client which
is not a master sends a read only command. In this case we are safe and
can consider the key as non existing.

This commit does a few changes in order to make this sane:

1. lookupKeyRead() is modified in order to return NULL if the above
conditions are met.
2. Calls to lookupKeyRead() in commands actually writing to the data set
are repliaced with calls to lookupKeyWrite().

There are redundand checks, so for example, if in "2" something was
overlooked, we should be still safe, since anyway, when the master
writes the behavior is to don't care about what expireIfneeded()
returns.

This commit is related to  #1768, #1770, #2131.
 2014-12-10 16:10:21 +01:00
Salvatore Sanfilippo
1aa2f9357c Merge pull request #2133 from chooper/histfile-override 
override histfile from env - fixes #831 and copies #833
 2014-12-10 15:28:41 +01:00
antirez
8a03ffa160 Sentinel: INFO-CACHE comments reworked a bit. 
Changed in order to make them more review friendly, based on the
experience of reviewing the code myself.
 2014-12-10 11:15:13 +01:00
antirez
3f2975ad12 Sentinel: INFO-CACHE GCC minior code cleanup. 
I guess the initial goal of the initialization was to suppress GCC
warning, but if we have to initialize, we can do it with the base-case
value instead of NULL which is never retained.
 2014-12-10 11:12:26 +01:00
antirez
043ae412ca Sentinel: removed useless flag var from INFO-CACHE. 2014-12-10 11:05:37 +01:00
antirez
71e4635ae9 Sentinel: INFO-CACHE reply format command shortened. 2014-12-10 11:04:24 +01:00
Salvatore Sanfilippo
2a8f657b3b Merge pull request #2148 from mattsta/feature/sentinel/info-cache 
Add SENTINEL INFO-CACHE [masters...]
 2014-12-10 11:02:42 +01:00
antirez
b06903493f Merge branch 'unstable' of github.com:/antirez/redis into unstable 2014-12-10 09:51:00 +01:00
Salvatore Sanfilippo
8b2dbb7477 Merge pull request #2203 from Brochen/unstable 
Update sds.c
 2014-12-10 09:50:36 +01:00
antirez
a6793ec030 test-sds target in Makefile to run sds.c tests. 2014-12-10 09:50:27 +01:00
antirez
1a5d6bf9f8 sds.c: more tests for sdstrim(). 2014-12-10 09:48:56 +01:00
Brochen
3b452712ea Update sds.c 
in the case (all chars of the string s found in 'cset' ),
line[573] will no more do the same thing line[572] did.
this will be more faster especially in the case that the string s is very long and all chars of string s found in 'cset'
 2014-12-10 11:19:13 +08:00
Salvatore Sanfilippo
b55a5a2bcb Merge pull request #2165 from sunheehnus/zipmap-read 
zipmap.c: update comments above
 2014-12-09 15:57:17 +01:00
Salvatore Sanfilippo
b00ed695ef Merge pull request #2176 from deepakverma/redis_bench_authfix 
redis-benchmark AUTH command to be discarded after the first send #2150
 2014-12-09 15:24:44 +01:00
Salvatore Sanfilippo
dcbccce614 Merge pull request #2119 from sunheehnus/unstable 
sds.c/sdscatvprintf: va_end needs to be fixed
 2014-12-09 15:13:05 +01:00
antirez
26b5bd7ef5 Include stropts only if __sun is defined. 2014-12-09 12:59:46 +01:00
Salvatore Sanfilippo
bf0896307b Merge pull request #2177 from badboy/solaris-ioctl-warn-fix 
Fix implicit declaration of ioctl on Solaris
 2014-12-09 12:57:22 +01:00
Salvatore Sanfilippo
df397740c1 Merge pull request #2179 from sunheehnus/bitops-read 
bitops.c/redisPopcount: optimization in loop
 2014-12-09 12:46:15 +01:00
Salvatore Sanfilippo
cb1c8a4300 Merge pull request #2189 from jbergstroem/glibc_220_default_warn 
Silence _BSD_SOURCE warnings in glibc 2.20 and forward
 2014-12-09 12:24:04 +01:00
antirez
ea53a9918e Mark whatisdoing.sh as deprecated in top-comment. 2014-12-09 12:18:34 +01:00
Salvatore Sanfilippo
beb39015a0 Merge pull request #2192 from sergeyklay/patch-1 
getting pid fixes
 2014-12-09 12:09:08 +01:00
Salvatore Sanfilippo
f2af27f04c Merge pull request #2197 from sunheehnus/sparkline 
sparkline.c: mov label-ini into the AddSample Function
 2014-12-09 11:27:40 +01:00
Salvatore Sanfilippo
7e47299aa5 Merge pull request #2200 from badboy/iss2066-additional 
Only ignore sigpipe in interactive mode
 2014-12-09 08:59:49 +01:00
Jan-Erik Rediger
95f157c35a Only ignore sigpipe in interactive mode 
This allows shell pipes to correctly end redis-cli.

Ref #2066
 2014-12-09 00:58:42 +01:00
Sun He
a2d667d2b7 sparkline.c: AddSample skip Empty label 2014-12-08 11:43:32 +08:00
Sun He
c965d0425d sparkline.c: mov label-ini into the AddSample Function 2014-12-08 11:15:06 +08:00
Serghei Iakovlev
0b5732b3b3 Update whatisdoing.sh 
Improved getting pid
 2014-12-05 18:48:20 +02:00
Serghei Iakovlev
4759bface5 getting pid fixes 
```sh
$ ~ pidof redis-server
# nothing

$ ~ ps aux | grep [r]edis
redis      593  0.0  0.0  36900  5564 ?        Ssl  Dec02   1:37 /usr/bin/redis-server 127.0.0.1:6379
klay     15927  0.0  0.0  16772  6068 pts/6    S+   13:58   0:00 redis-cli

$ ~ uname -a
Linux edge 3.17.4-1-ARCH #1 SMP PREEMPT Fri Nov 21 21:14:42 CET 2014 x86_64 GNU/Linux
```
 2014-12-05 14:50:45 +02:00
antirez
5143a209e3 Simplify lua_cmsgpack macro and fix build on old Linux distros. 
Thanks to @badboy for the help in checking the build after the fix.
 2014-12-05 10:51:25 +01:00
Johan Bergström
77c03b4941 Silence _BSD_SOURCE warnings in glibc 2.20 and forward 
See https://sourceware.org/glibc/wiki/Release/2.20#Packaging_Changes
 2014-12-05 12:41:59 +11:00
antirez
368de4315a Check that tcp-backlog is matched by /proc/sys/net/core/somaxconn. 2014-12-04 11:02:53 +01:00
antirez
cf30e64410 Network bandwidth tracking + refactoring. 
Track bandwidth used by clients and replication (but diskless
replication is not tracked since the actual transfer happens in the
child process).

This includes a refactoring that makes tracking new instantaneous
metrics simpler.
 2014-12-03 12:16:25 +01:00
antirez
8d56b142b0 Don't show the ASCII logo if syslog is enabled. 
Closes issue #1935.
 2014-12-03 10:50:47 +01:00