[Gfarm-commits] SF.net SVN: gfarm:[6601] gfarm_v2/branches/2.5/server/gfmd/db_journal_apply .c

[<n-...@us...>]

Revision: 6601
          http://gfarm.svn.sourceforge.net/gfarm/?rev=6601&view=rev
Author:   n-soda
Date:     2012-08-29 23:18:59 +0000 (Wed, 29 Aug 2012)
Log Message:
-----------
fix #434 - gfmd crashes with <err> [1003180] db_journal_apply_op[apply] : seqnum=258541552 ope=FILECOPY_ADD : already exists / <err> [1003189] failed to read journal or apply to memory/db : already exists

by just ignoring the error.

according to two crash dumps of #431,
there is no duplicate file_copy in memory of master gfmd.
thus, ignoring this in slave must be safe.
fixing #431 is the real problem, though.

Modified Paths:
--------------
    gfarm_v2/branches/2.5/server/gfmd/db_journal_apply.c

Modified: gfarm_v2/branches/2.5/server/gfmd/db_journal_apply.c
===================================================================
--- gfarm_v2/branches/2.5/server/gfmd/db_journal_apply.c	2012-08-29 22:49:57 UTC (rev 6600)
+++ gfarm_v2/branches/2.5/server/gfmd/db_journal_apply.c	2012-08-29 23:18:59 UTC (rev 6601)
@@ -472,6 +472,16 @@
 		    gfarm_error_string(e));
 	} else if ((e = inode_add_file_copy_in_cache(n,
 	    host)) != GFARM_ERR_NO_ERROR) {
+#if 1 /* XXX FIXME: workaround for SourceForge #434 (#431) */
+		if (e == GFARM_ERR_ALREADY_EXISTS) {
+			gflog_error(GFARM_MSG_UNFIXED,
+			    "db_journal_apply_filecopy_add: "
+			    "inum=%llu hostname=%s: ignoring - %s",
+			    (unsigned long long)arg->inum, arg->hostname,
+			    gfarm_error_string(e));
+			return (GFARM_ERR_NO_ERROR); /* ignore this error */
+		}
+#endif
 		gflog_error(GFARM_MSG_1003229,
 		    "inum=%llu hostname=%s : %s",
 		    (unsigned long long)arg->inum, arg->hostname,

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.