Menu
▾
▴
[Gfarm-commits] SF.net SVN: gfarm:[8786] gfarm_v2/branches/2.6
|
From: <n-...@us...> - 2013-12-25 00:10:54
|
Revision: 8786
http://gfarm.svn.sourceforge.net/gfarm/?rev=8786&view=rev
Author: n-soda
Date: 2013-12-25 00:10:48 +0000 (Wed, 25 Dec 2013)
Log Message:
-----------
merge r8785 from the main trunk:
add workaround against #737 - gfmd crash in db_journal_store_thread(), when gfmd is stopped during startup
Revision Links:
--------------
http://gfarm.svn.sourceforge.net/gfarm/?rev=8785&view=rev
Modified Paths:
--------------
gfarm_v2/branches/2.6/server/gfmd/journal_file.c
Property Changed:
----------------
gfarm_v2/branches/2.6/
Property changes on: gfarm_v2/branches/2.6
___________________________________________________________________
Modified: svn:mergeinfo
- /gfarm_v2/branches/2.4:5271,5275-5281,5290,5329
/gfarm_v2/branches/2.5:7212,7214,7216-7217,7225,7246,7252,7254-7256,7260,7286,7509,7560-7561,7564,7573,7593-7596,7608,7619-7620,7633,7650,7655,7663,7677,7680,7700,7717,7725,7728,7732,7736,7780,7796,7813,7852,7855,7876,7897,7908,7918,7922,7924,7929,7933,7941-7942,7946-7948,7950,7954,7983,7997,8005,8008,8011,8014,8017,8028,8035-8037,8040,8043,8050,8053,8057-8058,8072,8078,8083,8095,8097,8106,8116-8118,8122,8137,8149,8154,8163,8167,8180-8181,8189,8192,8196,8227,8232,8236,8241,8245,8280,8294-8295,8310,8313,8333,8336,8339,8342-8347,8350,8413-8414,8417,8420,8423,8429-8430,8436,8439,8454,8505,8520,8533,8599,8605,8614,8654,8657,8669,8674,8681,8684,8689,8695,8700,8724,8736-8739,8742,8746,8750,8759-8760,8765,8769,8779
/gfarm_v2/branches/2.5.7:6801,6804,6989,6998-6999,7572,7945,8115
/gfarm_v2/trunk:5598-5599,5616-5624,5626-5628,5641-5647,5650,5653,5657-5666,5669-5670,5673-5674,5683-5685,5693,5695-5696,5699,5704-5711,5717,5719-5720,5726-5727,5729-5730,5739,5746-5751,5775,5793,5799,5806,5808-5809,5815-5818,5821,5825,5827-5831,5839-5842,5844-5849,5851,5863-5864,5868,5870,5872-5878,5881,5884-5886,5889,5897,5913,5915,5924,5928,5930,5932,5934,5937,5942-5948,5959,5966-5972,5974-5975,5980,5994,5997-5998,6001-6007,6012-6013,6016,6019-6022,6024-6029,6031-6032,6034,6040,6042-6047,6053,6062-6063,6065,6067,6070,6073,6077-6079,6081,6083-6084,6086,6089,6091,6093,6095,6101,6103,6107-6108,6111,6115-6118,6120,6122,6129,6131-6137,6139,6141-6142,6144-6150,6152-6157,6159,6161,6166,6168,6173,6175,6177-6179,6181-6185,6188,6190-6193,6196,6214,6217-6218,6220-6223,6230-6232,6238-6239,6242,6247-6248,6250,6252,6255,6257-6258,6263,6265,6268,6271-6273,6276-6278,6282,6286-6287,6289,6292-6296,6298,6304-6306,6309-6310,6314-6315,6331-6333,6335,6340,6354,6361,6377,6380,6394-6397,6406,6413-6414,6420,6423-6427,6437,6448,6451-6452,6455,6458-6459,6469-6470,6476,6486,6553,6567,6571,6575,6577,6580-6581,6604,6614,6616,6630,6638,6645,6700,6741,6747,6754,6756,6758,6762,6764,6766,6768,6770,6778,6807,6810,6815,6823,6825,6836-6837,6839,6852,6854,6856,6865,6879,6926,6928,6939,6945-6946,6948-6952,6956,7008,7012,7015,7097,7099,7101,7103,7122,7167,7178,7181,7185,7200,7218-7222,7228-7229,7233,7236,7239,7242,7249,7529-7530,7532,7536,7566,7578,7597,7601,7659,7664,7666,7672,7674,7686,7697,7705,7709,7713,7721,7747,7751,7755,7758,7762-7763,7768,7775,7788,7798-7799,7801,7806,7827,7831,7836,7842,7847,7866,7878,7881,7884,7888,7892,7914,7916,7936,7967,7971,7979,7993,8001,8020,8024,8029,8046,8048,8141,8158,8240,8255,8380,8540,8567,8715,8728,8756,8782
+ /gfarm_v2/branches/2.4:5271,5275-5281,5290,5329
/gfarm_v2/branches/2.5:7212,7214,7216-7217,7225,7246,7252,7254-7256,7260,7286,7509,7560-7561,7564,7573,7593-7596,7608,7619-7620,7633,7650,7655,7663,7677,7680,7700,7717,7725,7728,7732,7736,7780,7796,7813,7852,7855,7876,7897,7908,7918,7922,7924,7929,7933,7941-7942,7946-7948,7950,7954,7983,7997,8005,8008,8011,8014,8017,8028,8035-8037,8040,8043,8050,8053,8057-8058,8072,8078,8083,8095,8097,8106,8116-8118,8122,8137,8149,8154,8163,8167,8180-8181,8189,8192,8196,8227,8232,8236,8241,8245,8280,8294-8295,8310,8313,8333,8336,8339,8342-8347,8350,8413-8414,8417,8420,8423,8429-8430,8436,8439,8454,8505,8520,8533,8599,8605,8614,8654,8657,8669,8674,8681,8684,8689,8695,8700,8724,8736-8739,8742,8746,8750,8759-8760,8765,8769,8779
/gfarm_v2/branches/2.5.7:6801,6804,6989,6998-6999,7572,7945,8115
/gfarm_v2/trunk:5598-5599,5616-5624,5626-5628,5641-5647,5650,5653,5657-5666,5669-5670,5673-5674,5683-5685,5693,5695-5696,5699,5704-5711,5717,5719-5720,5726-5727,5729-5730,5739,5746-5751,5775,5793,5799,5806,5808-5809,5815-5818,5821,5825,5827-5831,5839-5842,5844-5849,5851,5863-5864,5868,5870,5872-5878,5881,5884-5886,5889,5897,5913,5915,5924,5928,5930,5932,5934,5937,5942-5948,5959,5966-5972,5974-5975,5980,5994,5997-5998,6001-6007,6012-6013,6016,6019-6022,6024-6029,6031-6032,6034,6040,6042-6047,6053,6062-6063,6065,6067,6070,6073,6077-6079,6081,6083-6084,6086,6089,6091,6093,6095,6101,6103,6107-6108,6111,6115-6118,6120,6122,6129,6131-6137,6139,6141-6142,6144-6150,6152-6157,6159,6161,6166,6168,6173,6175,6177-6179,6181-6185,6188,6190-6193,6196,6214,6217-6218,6220-6223,6230-6232,6238-6239,6242,6247-6248,6250,6252,6255,6257-6258,6263,6265,6268,6271-6273,6276-6278,6282,6286-6287,6289,6292-6296,6298,6304-6306,6309-6310,6314-6315,6331-6333,6335,6340,6354,6361,6377,6380,6394-6397,6406,6413-6414,6420,6423-6427,6437,6448,6451-6452,6455,6458-6459,6469-6470,6476,6486,6553,6567,6571,6575,6577,6580-6581,6604,6614,6616,6630,6638,6645,6700,6741,6747,6754,6756,6758,6762,6764,6766,6768,6770,6778,6807,6810,6815,6823,6825,6836-6837,6839,6852,6854,6856,6865,6879,6926,6928,6939,6945-6946,6948-6952,6956,7008,7012,7015,7097,7099,7101,7103,7122,7167,7178,7181,7185,7200,7218-7222,7228-7229,7233,7236,7239,7242,7249,7529-7530,7532,7536,7566,7578,7597,7601,7659,7664,7666,7672,7674,7686,7697,7705,7709,7713,7721,7747,7751,7755,7758,7762-7763,7768,7775,7788,7798-7799,7801,7806,7827,7831,7836,7842,7847,7866,7878,7881,7884,7888,7892,7914,7916,7936,7967,7971,7979,7993,8001,8020,8024,8029,8046,8048,8141,8158,8240,8255,8380,8540,8567,8715,8728,8756,8782,8785
Modified: gfarm_v2/branches/2.6/server/gfmd/journal_file.c
===================================================================
--- gfarm_v2/branches/2.6/server/gfmd/journal_file.c 2013-12-25 00:08:29 UTC (rev 8785)
+++ gfarm_v2/branches/2.6/server/gfmd/journal_file.c 2013-12-25 00:10:48 UTC (rev 8786)
@@ -1538,12 +1538,13 @@
if (jf == NULL)
return;
journal_file_mutex_lock(jf, diag);
- journal_file_reader_close_unlocked(journal_file_main_reader(jf));
#if 0 /*
* We don't have to do this, because storage for jf is never freed.
* We shouldn't do this, because doing so makes
- * journal_file_mutex_lock(reader->file, ) dump core.
+ * journal_file_mutex_lock(reader->file, ) dump core,
+ * or db_journal_store_thread() dump core (see SF.net #737).
*/
+ journal_file_reader_close_unlocked(journal_file_main_reader(jf));
GFARM_HCIRCLEQ_FOREACH_SAFE(reader, jf->reader_list, readers, reader2)
journal_file_reader_detach(reader);
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|