fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-19 17:10:50 +00:00
Code Issues Projects Releases Wiki Activity

Do not attempt to lock on Solaris

Browse Source
This commit is contained in:
Jan-Erik Rediger 2015-06-24 12:55:00 +02:00
parent 821a986643
commit d28c51d166
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/cluster.c
View File

@ -358,6 +358,11 @@ void clusterSaveConfigOrDie(int do_fsync) {
* On success REDIS_OK is returned, otherwise an error is logged and * On success REDIS_OK is returned, otherwise an error is logged and
* the function returns REDIS_ERR to signal a lock was not acquired. */ * the function returns REDIS_ERR to signal a lock was not acquired. */
int clusterLockConfig(char *filename) { int clusterLockConfig(char *filename) {
/* flock() does not exist on Solaris
* and a fcntl-based solution won't help, as we constantly re-open that file,
* which will release _all_ locks anyway
*/
#if !defined(__sun)
/* To lock it, we need to open the file in a way it is created if /* To lock it, we need to open the file in a way it is created if
* it does not exist, otherwise there is a race condition with other * it does not exist, otherwise there is a race condition with other
* processes. */ * processes. */
@ -385,6 +390,8 @@ int clusterLockConfig(char *filename) {
} }
/* Lock acquired: leak the 'fd' by not closing it, so that we'll retain the /* Lock acquired: leak the 'fd' by not closing it, so that we'll retain the
* lock to the file as long as the process exists. */ * lock to the file as long as the process exists. */
#endif /* __sun */
return REDIS_OK; return REDIS_OK;
} }