gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disambiguate temp rdb files so its less likely two servers with the same working dir will collide

Browse Source 
Former-commit-id: 8fbc5a63c54589bb42aa1b1b53c56f399211605c
This commit is contained in:
John Sully 2020-06-04 00:25:37 -04:00
parent d21486d065
commit 959c6b8a19
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/rdb.cpp
View File

@ -1375,7 +1375,7 @@ int rdbSaveFile(char *filename, const redisDbPersistentDataSnapshot **rgpdb, rdb
rio rdb; rio rdb;
int error = 0; int error = 0;
snprintf(tmpfile,256,"temp-%d.rdb", g_pserver->rdbThreadVars.tmpfileNum); snprintf(tmpfile,256,"temp-%d-%d.rdb", getpid(), g_pserver->rdbThreadVars.tmpfileNum);
fp = fopen(tmpfile,"w"); fp = fopen(tmpfile,"w");
if (!fp) { if (!fp) {
char *cwdp = getcwd(cwd,MAXPATHLEN); char *cwdp = getcwd(cwd,MAXPATHLEN);
@ -1539,7 +1539,7 @@ int rdbSaveBackground(rdbSaveInfo *rsi) {
void rdbRemoveTempFile(int tmpfileNum) { void rdbRemoveTempFile(int tmpfileNum) {
char tmpfile[256]; char tmpfile[256];
snprintf(tmpfile,sizeof(tmpfile),"temp-%d.rdb", tmpfileNum); snprintf(tmpfile,sizeof(tmpfile),"temp-%d-%d.rdb", getpid(), tmpfileNum);
unlink(tmpfile); unlink(tmpfile);
} }