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

27289 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Stancliff
78c1df12da Remove ziplist compiler warnings 
Only happen when compiled with the test define.
 2014-12-23 09:31:03 -05:00
Matt Stancliff
8380655e85 Remove ziplist compiler warnings 
Only happen when compiled with the test define.
 2014-12-23 09:31:03 -05:00
Matt Stancliff
2a43fbac46 Add DEBUG JEMALLOC INFO 
Uses jemalloc function malloc_stats_print() to return
stats about what jemalloc has allocated internally.
 2014-12-23 09:31:03 -05:00
Matt Stancliff
27937c2821 Add DEBUG JEMALLOC INFO 
Uses jemalloc function malloc_stats_print() to return
stats about what jemalloc has allocated internally.
 2014-12-23 09:31:03 -05:00
Matt Stancliff
87d6324607 Add addReplyBulkSds() function 
Refactor a common pattern into one function so we don't
end up with copy/paste programming.
 2014-12-23 09:31:02 -05:00
Matt Stancliff
ad41a7c404 Add addReplyBulkSds() function 
Refactor a common pattern into one function so we don't
end up with copy/paste programming.
 2014-12-23 09:31:02 -05:00
antirez
50905988b1 Merge branch 'unstable' of github.com:/antirez/redis into unstable 2014-12-23 14:54:56 +01:00
antirez
9e718a1f57 Merge branch 'unstable' of github.com:/antirez/redis into unstable 2014-12-23 14:54:56 +01:00
antirez
c406fc16e6 INFO loading stats: three fixes. 
1. Server unxtime may remain not updated while loading AOF, so ETA is
not updated correctly.

2. Number of processed byte was not initialized.

3. Possible division by zero condition (likely cause of issue #1932).
 2014-12-23 14:54:34 +01:00
antirez
840435ad0b INFO loading stats: three fixes. 
1. Server unxtime may remain not updated while loading AOF, so ETA is
not updated correctly.

2. Number of processed byte was not initialized.

3. Possible division by zero condition (likely cause of issue #1932).
 2014-12-23 14:54:34 +01:00
Salvatore Sanfilippo
79f381a3c4 Merge pull request #2227 from mattsta/fix/trib/assignment/master-replica 
Improve redis-trib replica assignment
 2014-12-23 11:00:00 +01:00
Salvatore Sanfilippo
f7bc1fcea9 Merge pull request #2227 from mattsta/fix/trib/assignment/master-replica 
Improve redis-trib replica assignment
 2014-12-23 11:00:00 +01:00
Salvatore Sanfilippo
0d6962c47e Merge pull request #2234 from mattsta/feature/sentinel-info-cache/age 
Add 'age' value to SENTINEL INFO-CACHE
 2014-12-23 10:58:43 +01:00
Salvatore Sanfilippo
3a1ee895fa Merge pull request #2234 from mattsta/feature/sentinel-info-cache/age 
Add 'age' value to SENTINEL INFO-CACHE
 2014-12-23 10:58:43 +01:00
Matt Stancliff
1ad036ab8f Add 'age' value to SENTINEL INFO-CACHE 2014-12-22 21:17:04 -05:00
Matt Stancliff
32bba43ac7 Add 'age' value to SENTINEL INFO-CACHE 2014-12-22 21:17:04 -05:00
Salvatore Sanfilippo
e889c066f0 Merge pull request #2229 from advance512/spopWithCount 
Memory leak fixes (+ code style fixes)
 2014-12-22 11:00:39 +01:00
Salvatore Sanfilippo
5888290d26 Merge pull request #2229 from advance512/spopWithCount 
Memory leak fixes (+ code style fixes)
 2014-12-22 11:00:39 +01:00
Alon Diamant
2a52664067 Fixed memory leaks in rdbSaveToSlavesSockets() 2014-12-21 16:13:45 +02:00
Alon Diamant
14b04c062e Fixed memory leaks in rdbSaveToSlavesSockets() 2014-12-21 16:13:45 +02:00
Alon Diamant
3167c449e4 Following @mattsta's friendly review: 
1. memory leak in t_set.c has been fixed
  2. end-of-line spaces has been removed (from all over the place)
  3. for loops have been ordered up to match existing Redis style (less weird)
  4. comments format has been fixed (added * in the beggining of every comment line)
 2014-12-21 16:13:45 +02:00
Alon Diamant
d74a5a0880 Following @mattsta's friendly review: 
1. memory leak in t_set.c has been fixed
  2. end-of-line spaces has been removed (from all over the place)
  3. for loops have been ordered up to match existing Redis style (less weird)
  4. comments format has been fixed (added * in the beggining of every comment line)
 2014-12-21 16:13:45 +02:00
Matt Stancliff
08fab69526 Improve redis-trib replica assignment 
This tiny bit of code has gone through so many revisions.  Hopefully
it's more correct now.

Fixes #2204
 2014-12-19 21:56:14 -05:00
Matt Stancliff
b55f742e46 Improve redis-trib replica assignment 
This tiny bit of code has gone through so many revisions.  Hopefully
it's more correct now.

Fixes #2204
 2014-12-19 21:56:14 -05:00
antirez
e937a892b4 Fix adjustOpenFilesLimit() logging to match real state. 
Fixes issue #2225.
 2014-12-19 10:04:15 +01:00
antirez
e3436dd9b8 Fix adjustOpenFilesLimit() logging to match real state. 
Fixes issue #2225.
 2014-12-19 10:04:15 +01:00
Salvatore Sanfilippo
760f6ce0f2 Merge pull request #2224 from advance512/spopWithCount 
Fix: case when SPOP with count>MAXINT, setTypeRandomElements() will get ...
 2014-12-18 15:11:44 +01:00
Salvatore Sanfilippo
efbf5a125e Merge pull request #2224 from advance512/spopWithCount 
Fix: case when SPOP with count>MAXINT, setTypeRandomElements() will get ...
 2014-12-18 15:11:44 +01:00
Alon Diamant
4f5e9325cd Fix: case when SPOP with count>MAXINT, setTypeRandomElements() will get negative count argument due to signed/unsigned mismatch. 
setTypeRandomElements() now returns unsigned long, and also uses unsigned long for anything related to count of members.
spopWithCountCommand() now uses unsigned long elements_returned instead of int, for values returned from setTypeRandomElements()
 2014-12-18 14:38:20 +02:00
Alon Diamant
3c8a75583d Fix: case when SPOP with count>MAXINT, setTypeRandomElements() will get negative count argument due to signed/unsigned mismatch. 
setTypeRandomElements() now returns unsigned long, and also uses unsigned long for anything related to count of members.
spopWithCountCommand() now uses unsigned long elements_returned instead of int, for values returned from setTypeRandomElements()
 2014-12-18 14:38:20 +02:00
Salvatore Sanfilippo
bb828a44e5 Merge pull request #2215 from advance512/spopWithCount 
SPOP optional count argument. (issue #1793, supersedes pull request #1803)
 2014-12-17 17:59:59 +01:00
Salvatore Sanfilippo
70674ac677 Merge pull request #2215 from advance512/spopWithCount 
SPOP optional count argument. (issue #1793, supersedes pull request #1803)
 2014-12-17 17:59:59 +01:00
Salvatore Sanfilippo
0236c33d26 Merge pull request #1582 from mattsta/add-error-mention-to-error-condition 
Cluster: Update accept error to mention error
 2014-12-17 17:48:18 +01:00
Salvatore Sanfilippo
abd95ffdfd Merge pull request #1582 from mattsta/add-error-mention-to-error-condition 
Cluster: Update accept error to mention error
 2014-12-17 17:48:18 +01:00
antirez
86dd2e3048 Add info as requested by the original getMemorySize() license. 2014-12-17 17:15:39 +01:00
antirez
9a6354316b Add info as requested by the original getMemorySize() license. 2014-12-17 17:15:39 +01:00
antirez
fece4bf209 getMemorySize() moved into zmalloc.c with other low level mem utils. 
See issue #2218.
 2014-12-17 17:11:20 +01:00
antirez
615f6923d5 getMemorySize() moved into zmalloc.c with other low level mem utils. 
See issue #2218.
 2014-12-17 17:11:20 +01:00
antirez
8749c155d6 Merge branch 'improve/INFO/add-system-memory-size' of git://github.com/mattsta/redis into unstable 2014-12-17 17:07:30 +01:00
antirez
e1e41f691f Merge branch 'improve/INFO/add-system-memory-size' of git://github.com/mattsta/redis into unstable 2014-12-17 17:07:30 +01:00
Matt Stancliff
7da577fd8b Cluster: Notify user on accept error 
If we woke up to accept a connection, but we can't
accept it, inform the user of the error going on
with their networking.

(The previous message was the same for success or error!)
 2014-12-17 10:49:32 -05:00
Matt Stancliff
a772747ffc Cluster: Notify user on accept error 
If we woke up to accept a connection, but we can't
accept it, inform the user of the error going on
with their networking.

(The previous message was the same for success or error!)
 2014-12-17 10:49:32 -05:00
Salvatore Sanfilippo
55d4f8371a Merge pull request #2221 from rhoml/rhoml/fix-redis-sentinel-ln 
Fix redis-sentinel symlink to a relative path
 2014-12-17 12:27:22 +01:00
Salvatore Sanfilippo
25b06cd3ce Merge pull request #2221 from rhoml/rhoml/fix-redis-sentinel-ln 
Fix redis-sentinel symlink to a relative path
 2014-12-17 12:27:22 +01:00
Rhommel Lamas
1cea913b29 Add redis-sentinel symlink to a relative path 2014-12-17 11:04:08 +01:00
Rhommel Lamas
24f4c01832 Add redis-sentinel symlink to a relative path 2014-12-17 11:04:08 +01:00
antirez
355ab9ccc0 Fix comment in clusterHandleSlaveFailover(). 2014-12-16 15:03:12 +01:00
antirez
1aef29e079 Fix comment in clusterHandleSlaveFailover(). 2014-12-16 15:03:12 +01:00
antirez
655c0b46ff Make sure buffer is enough in clusterSendPing(). 2014-12-15 10:18:22 +01:00
antirez
90c7d8cfa1 Make sure buffer is enough in clusterSendPing(). 2014-12-15 10:18:22 +01:00