From: <ta...@us...> - 2012-11-30 16:05:39
|
Revision: 7228 http://gfarm.svn.sourceforge.net/gfarm/?rev=7228&view=rev Author: tatebe Date: 2012-11-30 16:05:29 +0000 (Fri, 30 Nov 2012) Log Message: ----------- merge r7217 from the 2.5 branch - assign log message numbers Revision Links: -------------- http://gfarm.svn.sourceforge.net/gfarm/?rev=7217&view=rev Modified Paths: -------------- gfarm_v2/trunk/include/gfarm/gfarm_msg_enums.h gfarm_v2/trunk/lib/libgfarm/gfarm/auth_server.c gfarm_v2/trunk/lib/libgfarm/gfarm/config.c gfarm_v2/trunk/lib/libgfarm/gfarm/config_client.c gfarm_v2/trunk/lib/libgfarm/gfarm/gfarm_foreach.c gfarm_v2/trunk/lib/libgfarm/gfarm/gfs_statfsnode.c gfarm_v2/trunk/lib/libgfarm/gfarm/iostat.c gfarm_v2/trunk/lib/libgfarm/gfarm/schedule.c gfarm_v2/trunk/lib/libgfarm/gfutil/gfevent.c gfarm_v2/trunk/lib/libgfarm/gfutil/thrsubr.c gfarm_v2/trunk/makes/.msgno gfarm_v2/trunk/server/gfmd/fs.c gfarm_v2/trunk/server/gfmd/gfmd.c gfarm_v2/trunk/server/gfmd/gfmd_channel.c gfarm_v2/trunk/server/gfmd/inode.c gfarm_v2/trunk/server/gfmd/mdhost.c gfarm_v2/trunk/server/gfmd/peer.c gfarm_v2/trunk/server/gfmd/replica_check.c gfarm_v2/trunk/server/gfmd/xattr.c gfarm_v2/trunk/server/gfsd/gfsd.c gfarm_v2/trunk/server/gfsd/spck.c Property Changed: ---------------- gfarm_v2/trunk/ gfarm_v2/trunk/gftool/gfdump/ gfarm_v2/trunk/gftool/gfdump/gfdump.postgresql.in gfarm_v2/trunk/gftool/gfgroup/gfgroup.c Property changes on: gfarm_v2/trunk ___________________________________________________________________ Modified: svn:mergeinfo - /gfarm_v2/branches/2.4:5271,5275-5281,5290,5329 /gfarm_v2/branches/2.5:5630-5631,5772,5803,5867,5951,5956,5958,5962,5983-5984,5988,6008,6035,6038,6060,6112,6199,6201,6204,6207,6209-6210,6288,6298,6301,6312,6317,6319,6323,6325,6329,6344,6362,6368,6401,6404,6412,6415,6417,6422,6430,6480-6481,6489,6493-6494,6497,6502,6506,6510-6511,6515,6519,6521,6523,6534,6540,6547,6559,6583,6585,6587-6588,6590,6594,6602,6606,6610,6612-6613,6618,6627,6636-6637,6641,6649,6654,6659,6663-6664,6673,6675,6677,6680,6682,6684,6686,6688-6689,6703,6709,6713-6714,6716,6718-6719,6721-6726,6730,6744,6749,6752,6760,6787,6793,6802,6805,6817,6827-6828,6830-6831,6845-6850,6860,6862,6867,6871-6872,6874,6878,6882-6883,6886,6888,6894,6902,6904,6907,6915,6917-6918,6923-6925,6931,6933,6944,6947,6974,6979,6983,6987,6992,7001,7004,7009,7016-7017,7025,7028,7034,7043,7045-7047,7049,7051-7055,7057-7058,7062-7064,7067,7069,7072,7075-7077,7079-7081,7083-7084,7086,7092,7094-7095,7107-7110,7112,7149,7172,7182,7189,7216 /gfarm_v2/branches/2.5.7:6801,6804,6989,6998-6999 + /gfarm_v2/branches/2.4:5271,5275-5281,5290,5329 /gfarm_v2/branches/2.5:5630-5631,5772,5803,5867,5951,5956,5958,5962,5983-5984,5988,6008,6035,6038,6060,6112,6199,6201,6204,6207,6209-6210,6288,6298,6301,6312,6317,6319,6323,6325,6329,6344,6362,6368,6401,6404,6412,6415,6417,6422,6430,6480-6481,6489,6493-6494,6497,6502,6506,6510-6511,6515,6519,6521,6523,6534,6540,6547,6559,6583,6585,6587-6588,6590,6594,6602,6606,6610,6612-6613,6618,6627,6636-6637,6641,6649,6654,6659,6663-6664,6673,6675,6677,6680,6682,6684,6686,6688-6689,6703,6709,6713-6714,6716,6718-6719,6721-6726,6730,6744,6749,6752,6760,6787,6793,6802,6805,6817,6827-6828,6830-6831,6845-6850,6860,6862,6867,6871-6872,6874,6878,6882-6883,6886,6888,6894,6902,6904,6907,6915,6917-6918,6923-6925,6931,6933,6944,6947,6974,6979,6983,6987,6992,7001,7004,7009,7016-7017,7025,7028,7034,7043,7045-7047,7049,7051-7055,7057-7058,7062-7064,7067,7069,7072,7075-7077,7079-7081,7083-7084,7086,7092,7094-7095,7107-7110,7112,7149,7172,7182,7189,7216-7217 /gfarm_v2/branches/2.5.7:6801,6804,6989,6998-6999 Property changes on: gfarm_v2/trunk/gftool/gfdump ___________________________________________________________________ Modified: svn:mergeinfo - /gfarm_v2/branches/2.5/gftool/gfdump:6480-6481,6521,6587,6618,6703,6713,6718,6721-6725,6730,6805,6817,6827-6828,6830-6831,6845-6850,6860,6862,6867,6871-6872,6874,6883,6888,6894,6902,6904,6907,6915,6917-6918,6923-6925,6931,6933,6944,6947,6974,6979,6983,6987,6992,7001,7004,7009,7016-7017,7025,7028,7034,7043,7045-7047,7049,7051-7055,7057-7058,7062-7064,7067,7069,7072,7075-7077,7079-7081,7083-7084,7086,7092,7094-7095,7107-7110,7112,7149,7172,7182,7189,7216 /gfarm_v2/branches/2.5.7/gftool/gfdump:6801,6804,6989,6998-6999 + /gfarm_v2/branches/2.5/gftool/gfdump:6480-6481,6521,6587,6618,6703,6713,6718,6721-6725,6730,6805,6817,6827-6828,6830-6831,6845-6850,6860,6862,6867,6871-6872,6874,6883,6888,6894,6902,6904,6907,6915,6917-6918,6923-6925,6931,6933,6944,6947,6974,6979,6983,6987,6992,7001,7004,7009,7016-7017,7025,7028,7034,7043,7045-7047,7049,7051-7055,7057-7058,7062-7064,7067,7069,7072,7075-7077,7079-7081,7083-7084,7086,7092,7094-7095,7107-7110,7112,7149,7172,7182,7189,7216-7217 /gfarm_v2/branches/2.5.7/gftool/gfdump:6801,6804,6989,6998-6999 Property changes on: gfarm_v2/trunk/gftool/gfdump/gfdump.postgresql.in ___________________________________________________________________ Modified: svn:mergeinfo - /gfarm_v2/branches/2.5/gftool/gfdump/gfdump.postgresql.in:6480-6481,6925,7053-7055,7057-7058,7062-7064,7067,7072,7075-7076,7079-7080,7083,7094-7095,7107,7109-7110,7112,7149,7172,7182,7189,7216 /gfarm_v2/branches/2.5.7/gftool/gfdump/gfdump.postgresql.in:6804,6989,6998-6999 + /gfarm_v2/branches/2.5/gftool/gfdump/gfdump.postgresql.in:6480-6481,6925,7053-7055,7057-7058,7062-7064,7067,7072,7075-7076,7079-7080,7083,7094-7095,7107,7109-7110,7112,7149,7172,7182,7189,7216-7217 /gfarm_v2/branches/2.5.7/gftool/gfdump/gfdump.postgresql.in:6804,6989,6998-6999 Property changes on: gfarm_v2/trunk/gftool/gfgroup/gfgroup.c ___________________________________________________________________ Modified: svn:mergeinfo - /gfarm_v2/branches/2.4/gftool/gfgroup/gfgroup.c:5271,5275-5281,5290,5329,5335 /gfarm_v2/branches/2.5/gftool/gfgroup/gfgroup.c:5630-5631,5772,5803,5867,5951,5956,5958,5962,5983-5984,5988,6008,6035,6038,6060,6112,6199,6201,6204,6207,6209-6210,6298,6301,6312,6317,6319,6323,6325,6329,6344,6362,6368,6401,6404,6412,6415,6417,6422,6430,6480-6481,6489,6493-6494,6502,6506,6510-6511,6515,6519,6521,6523,6547,6559,6583,6585,6587-6588,6590,6594,6602,6606,6610,6612,6618,6627,6636-6637,6641,6649,6654,6659,6663,6673,6675,6677,6680,6682,6684,6686,6688-6689,6703,6709,6713-6714,6716,6718-6719,6721-6726,6730,6744,6749,6752,6760,6787,6793,6802,6805,6817,6827-6828,6830-6831,6845-6850,6860,6862,6867,6871-6872,6874,6883,6888,6894,6902,6904,6907,6915,6917-6918,6923-6925,6931,6933,6944,6947,6974,6979,6983,6987,6992,7001,7004,7009,7016-7017,7025,7028,7034,7043,7045-7047,7049,7051-7055,7057-7058,7062-7064,7067,7069,7072,7075-7077,7079-7081,7083-7084,7086,7092,7094-7095,7107-7110,7112,7149,7172,7182,7189,7216 /gfarm_v2/branches/2.5.7/gftool/gfgroup/gfgroup.c:6801,6804,6989,6998-6999 + /gfarm_v2/branches/2.4/gftool/gfgroup/gfgroup.c:5271,5275-5281,5290,5329,5335 /gfarm_v2/branches/2.5/gftool/gfgroup/gfgroup.c:5630-5631,5772,5803,5867,5951,5956,5958,5962,5983-5984,5988,6008,6035,6038,6060,6112,6199,6201,6204,6207,6209-6210,6298,6301,6312,6317,6319,6323,6325,6329,6344,6362,6368,6401,6404,6412,6415,6417,6422,6430,6480-6481,6489,6493-6494,6502,6506,6510-6511,6515,6519,6521,6523,6547,6559,6583,6585,6587-6588,6590,6594,6602,6606,6610,6612,6618,6627,6636-6637,6641,6649,6654,6659,6663,6673,6675,6677,6680,6682,6684,6686,6688-6689,6703,6709,6713-6714,6716,6718-6719,6721-6726,6730,6744,6749,6752,6760,6787,6793,6802,6805,6817,6827-6828,6830-6831,6845-6850,6860,6862,6867,6871-6872,6874,6883,6888,6894,6902,6904,6907,6915,6917-6918,6923-6925,6931,6933,6944,6947,6974,6979,6983,6987,6992,7001,7004,7009,7016-7017,7025,7028,7034,7043,7045-7047,7049,7051-7055,7057-7058,7062-7064,7067,7069,7072,7075-7077,7079-7081,7083-7084,7086,7092,7094-7095,7107-7110,7112,7149,7172,7182,7189,7216-7217 /gfarm_v2/branches/2.5.7/gftool/gfgroup/gfgroup.c:6801,6804,6989,6998-6999 Modified: gfarm_v2/trunk/include/gfarm/gfarm_msg_enums.h =================================================================== --- gfarm_v2/trunk/include/gfarm/gfarm_msg_enums.h 2012-11-30 15:52:01 UTC (rev 7227) +++ gfarm_v2/trunk/include/gfarm/gfarm_msg_enums.h 2012-11-30 16:05:29 UTC (rev 7228) @@ -3563,3 +3563,120 @@ #define GFARM_MSG_1003561 1003561 #define GFARM_MSG_1003562 1003562 #define GFARM_MSG_1003563 1003563 +#define GFARM_MSG_1003564 1003564 +#define GFARM_MSG_1003565 1003565 +#define GFARM_MSG_1003566 1003566 +#define GFARM_MSG_1003567 1003567 +#define GFARM_MSG_1003568 1003568 +#define GFARM_MSG_1003569 1003569 +#define GFARM_MSG_1003570 1003570 +#define GFARM_MSG_1003571 1003571 +#define GFARM_MSG_1003572 1003572 +#define GFARM_MSG_1003573 1003573 +#define GFARM_MSG_1003574 1003574 +#define GFARM_MSG_1003575 1003575 +#define GFARM_MSG_1003576 1003576 +#define GFARM_MSG_1003577 1003577 +#define GFARM_MSG_1003578 1003578 +#define GFARM_MSG_1003579 1003579 +#define GFARM_MSG_1003580 1003580 +#define GFARM_MSG_1003581 1003581 +#define GFARM_MSG_1003582 1003582 +#define GFARM_MSG_1003583 1003583 +#define GFARM_MSG_1003584 1003584 +#define GFARM_MSG_1003585 1003585 +#define GFARM_MSG_1003586 1003586 +#define GFARM_MSG_1003587 1003587 +#define GFARM_MSG_1003588 1003588 +#define GFARM_MSG_1003589 1003589 +#define GFARM_MSG_1003590 1003590 +#define GFARM_MSG_1003591 1003591 +#define GFARM_MSG_1003592 1003592 +#define GFARM_MSG_1003593 1003593 +#define GFARM_MSG_1003594 1003594 +#define GFARM_MSG_1003595 1003595 +#define GFARM_MSG_1003596 1003596 +#define GFARM_MSG_1003597 1003597 +#define GFARM_MSG_1003598 1003598 +#define GFARM_MSG_1003599 1003599 +#define GFARM_MSG_1003600 1003600 +#define GFARM_MSG_1003601 1003601 +#define GFARM_MSG_1003602 1003602 +#define GFARM_MSG_1003603 1003603 +#define GFARM_MSG_1003604 1003604 +#define GFARM_MSG_1003605 1003605 +#define GFARM_MSG_1003606 1003606 +#define GFARM_MSG_1003607 1003607 +#define GFARM_MSG_1003608 1003608 +#define GFARM_MSG_1003609 1003609 +#define GFARM_MSG_1003610 1003610 +#define GFARM_MSG_1003611 1003611 +#define GFARM_MSG_1003612 1003612 +#define GFARM_MSG_1003613 1003613 +#define GFARM_MSG_1003614 1003614 +#define GFARM_MSG_1003615 1003615 +#define GFARM_MSG_1003616 1003616 +#define GFARM_MSG_1003617 1003617 +#define GFARM_MSG_1003618 1003618 +#define GFARM_MSG_1003619 1003619 +#define GFARM_MSG_1003620 1003620 +#define GFARM_MSG_1003621 1003621 +#define GFARM_MSG_1003622 1003622 +#define GFARM_MSG_1003623 1003623 +#define GFARM_MSG_1003624 1003624 +#define GFARM_MSG_1003625 1003625 +#define GFARM_MSG_1003626 1003626 +#define GFARM_MSG_1003627 1003627 +#define GFARM_MSG_1003628 1003628 +#define GFARM_MSG_1003629 1003629 +#define GFARM_MSG_1003630 1003630 +#define GFARM_MSG_1003631 1003631 +#define GFARM_MSG_1003632 1003632 +#define GFARM_MSG_1003633 1003633 +#define GFARM_MSG_1003634 1003634 +#define GFARM_MSG_1003635 1003635 +#define GFARM_MSG_1003636 1003636 +#define GFARM_MSG_1003637 1003637 +#define GFARM_MSG_1003638 1003638 +#define GFARM_MSG_1003639 1003639 +#define GFARM_MSG_1003640 1003640 +#define GFARM_MSG_1003641 1003641 +#define GFARM_MSG_1003642 1003642 +#define GFARM_MSG_1003643 1003643 +#define GFARM_MSG_1003644 1003644 +#define GFARM_MSG_1003645 1003645 +#define GFARM_MSG_1003646 1003646 +#define GFARM_MSG_1003647 1003647 +#define GFARM_MSG_1003648 1003648 +#define GFARM_MSG_1003649 1003649 +#define GFARM_MSG_1003650 1003650 +#define GFARM_MSG_1003651 1003651 +#define GFARM_MSG_1003652 1003652 +#define GFARM_MSG_1003653 1003653 +#define GFARM_MSG_1003654 1003654 +#define GFARM_MSG_1003655 1003655 +#define GFARM_MSG_1003656 1003656 +#define GFARM_MSG_1003657 1003657 +#define GFARM_MSG_1003658 1003658 +#define GFARM_MSG_1003659 1003659 +#define GFARM_MSG_1003660 1003660 +#define GFARM_MSG_1003661 1003661 +#define GFARM_MSG_1003662 1003662 +#define GFARM_MSG_1003663 1003663 +#define GFARM_MSG_1003664 1003664 +#define GFARM_MSG_1003665 1003665 +#define GFARM_MSG_1003666 1003666 +#define GFARM_MSG_1003667 1003667 +#define GFARM_MSG_1003668 1003668 +#define GFARM_MSG_1003669 1003669 +#define GFARM_MSG_1003670 1003670 +#define GFARM_MSG_1003671 1003671 +#define GFARM_MSG_1003672 1003672 +#define GFARM_MSG_1003673 1003673 +#define GFARM_MSG_1003674 1003674 +#define GFARM_MSG_1003675 1003675 +#define GFARM_MSG_1003676 1003676 +#define GFARM_MSG_1003677 1003677 +#define GFARM_MSG_1003678 1003678 +#define GFARM_MSG_1003679 1003679 +#define GFARM_MSG_1003680 1003680 Modified: gfarm_v2/trunk/lib/libgfarm/gfarm/auth_server.c =================================================================== --- gfarm_v2/trunk/lib/libgfarm/gfarm/auth_server.c 2012-11-30 15:52:01 UTC (rev 7227) +++ gfarm_v2/trunk/lib/libgfarm/gfarm/auth_server.c 2012-11-30 16:05:29 UTC (rev 7228) @@ -78,12 +78,12 @@ e = gfp_xdr_flush(conn); if (e != GFARM_ERR_NO_ERROR) { - gflog_info(GFARM_MSG_UNFIXED, + gflog_info(GFARM_MSG_1003571, "(%s@%s) auth_sharedsecret: cut: %s", global_username, hostname, gfarm_error_string(e)); } else if (try <= 1) { e = GFARM_ERR_AUTHENTICATION; - gflog_info(GFARM_MSG_UNFIXED, + gflog_info(GFARM_MSG_1003572, "(%s@%s) auth_sharedsecret: scaned: %s", global_username, hostname, gfarm_error_string(e)); } else { @@ -98,7 +98,7 @@ e = GFARM_ERR_AUTHENTICATION; break; } - gflog_info(GFARM_MSG_UNFIXED, + gflog_info(GFARM_MSG_1003573, "(%s@%s) auth_sharedsecret: gives up: %s", global_username, hostname, gfarm_error_string(e)); } @@ -125,7 +125,7 @@ if (e == GFARM_ERR_NO_ERROR) e = gfp_xdr_flush(conn); if (e != GFARM_ERR_NO_ERROR) { - gflog_info(GFARM_MSG_UNFIXED, + gflog_info(GFARM_MSG_1003574, "(%s@%s) auth_sharedsecret: challenge: %s", global_username, hostname, gfarm_error_string(e)); return (e); @@ -133,7 +133,7 @@ e = gfp_xdr_recv(conn, 0, &eof, "ib", &expire, sizeof(response), &len, response); if (e != GFARM_ERR_NO_ERROR) { - gflog_info(GFARM_MSG_UNFIXED, + gflog_info(GFARM_MSG_1003575, "(%s@%s) auth_sharedsecret: response: %s", global_username, hostname, gfarm_error_string(e)); return (e); @@ -157,13 +157,13 @@ GFARM_AUTH_SHARED_KEY_GET, 0)) != GFARM_ERR_NO_ERROR && e != GFARM_ERR_EXPIRED) { error = GFARM_AUTH_ERROR_INVALID_CREDENTIAL; - gflog_info(GFARM_MSG_UNFIXED, + gflog_info(GFARM_MSG_1003576, "(%s@%s) auth_sharedsecret: .gfarm_shared_key: %s", global_username, hostname, gfarm_error_string(e)); } else if (time(0) >= expire) { /* may reach here if (e == GFARM_ERR_EXPIRED) */ error = GFARM_AUTH_ERROR_EXPIRED; - gflog_info(GFARM_MSG_UNFIXED, + gflog_info(GFARM_MSG_1003577, "(%s@%s) auth_sharedsecret: key expired", global_username, hostname); } else { @@ -172,7 +172,7 @@ shared_key_expected, challenge, response_expected); if (expire != expire_expected) { error = GFARM_AUTH_ERROR_INVALID_CREDENTIAL; - gflog_info(GFARM_MSG_UNFIXED, + gflog_info(GFARM_MSG_1003578, "(%s@%s) auth_sharedsecret: expire time mismatch", global_username, hostname); } else if (memcmp(response, response_expected, @@ -188,7 +188,7 @@ *errorp = error; e = gfp_xdr_send(conn, "i", error); if (e != GFARM_ERR_NO_ERROR) { - gflog_info(GFARM_MSG_UNFIXED, + gflog_info(GFARM_MSG_1003579, "(%s@%s) auth_sharedsecret: send result: %s", global_username, hostname, gfarm_error_string(e)); return (e); @@ -196,7 +196,7 @@ if (error == GFARM_AUTH_ERROR_NO_ERROR) { e = gfp_xdr_flush(conn); if (e != GFARM_ERR_NO_ERROR) { - gflog_info(GFARM_MSG_UNFIXED, + gflog_info(GFARM_MSG_1003580, "(%s@%s) auth_sharedsecret: completion: %s", global_username, hostname, gfarm_error_string(e)); return (e); @@ -221,13 +221,13 @@ ++try; e = gfp_xdr_recv(conn, 0, &eof, "i", &request); if (e != GFARM_ERR_NO_ERROR) { - gflog_info(GFARM_MSG_UNFIXED, + gflog_info(GFARM_MSG_1003581, "(%s@%s) auth_sharedsecret_response: %s", global_username, hostname, gfarm_error_string(e)); return (e); } if (eof) { - gflog_info(GFARM_MSG_UNFIXED, + gflog_info(GFARM_MSG_1003582, "(%s@%s) auth_sharedsecret_response: " "unexpected EOF", global_username, hostname); return (GFARM_ERR_PROTOCOL); @@ -243,7 +243,7 @@ break; } if (e != GFARM_ERR_NO_ERROR) { - gflog_info(GFARM_MSG_UNFIXED, + gflog_info(GFARM_MSG_1003583, "(%s@%s) auth_sharedsecret: key query: %s", global_username, hostname, gfarm_error_string(e)); return (e); @@ -260,7 +260,7 @@ default: e = gfp_xdr_flush(conn); if (e != GFARM_ERR_NO_ERROR) { - gflog_info(GFARM_MSG_UNFIXED, + gflog_info(GFARM_MSG_1003584, "(%s@%s) auth_sharedsecret: request " "response: %s", global_username, hostname, gfarm_error_string(e)); @@ -287,12 +287,12 @@ e = gfp_xdr_recv(conn, 0, &eof, "s", &global_username); if (e != GFARM_ERR_NO_ERROR) { - gflog_info(GFARM_MSG_UNFIXED, + gflog_info(GFARM_MSG_1003585, "%s: authorize_sharedsecret: reading username", hostname); return (e); } if (eof) { - gflog_info(GFARM_MSG_UNFIXED, + gflog_info(GFARM_MSG_1003586, "%s: authorize_sharedsecret: unexpected EOF", hostname); return (GFARM_ERR_PROTOCOL); } Modified: gfarm_v2/trunk/lib/libgfarm/gfarm/config.c =================================================================== --- gfarm_v2/trunk/lib/libgfarm/gfarm/config.c 2012-11-30 15:52:01 UTC (rev 7227) +++ gfarm_v2/trunk/lib/libgfarm/gfarm/config.c 2012-11-30 16:05:29 UTC (rev 7228) @@ -2235,7 +2235,7 @@ e = get_one_argument(p, &s); if (e != GFARM_ERR_NO_ERROR) { - gflog_debug(GFARM_MSG_UNFIXED, + gflog_debug(GFARM_MSG_1003566, "get_one_argument failed " "when parsing spool_check_level(%s): %s", p, gfarm_error_string(e)); @@ -2246,7 +2246,7 @@ return (GFARM_ERR_NO_ERROR); e = gfarm_spool_check_level_set_by_name(s); if (e != GFARM_ERR_NO_ERROR) { - gflog_debug(GFARM_MSG_UNFIXED, + gflog_debug(GFARM_MSG_1003567, "spool_check_level(%s): %s", s, gfarm_error_string(e)); return (e); } @@ -2261,7 +2261,7 @@ e = get_one_argument(p, &s); if (e != GFARM_ERR_NO_ERROR) { - gflog_debug(GFARM_MSG_UNFIXED, + gflog_debug(GFARM_MSG_1003568, "get_one_argument failed " "when parsing atime(%s): %s", p, gfarm_error_string(e)); @@ -2272,7 +2272,7 @@ return (GFARM_ERR_NO_ERROR); e = gfarm_atime_type_set_by_name(s); if (e != GFARM_ERR_NO_ERROR) { - gflog_debug(GFARM_MSG_UNFIXED, + gflog_debug(GFARM_MSG_1003569, "atime(%s): %s", s, gfarm_error_string(e)); return (e); } Modified: gfarm_v2/trunk/lib/libgfarm/gfarm/config_client.c =================================================================== --- gfarm_v2/trunk/lib/libgfarm/gfarm/config_client.c 2012-11-30 15:52:01 UTC (rev 7227) +++ gfarm_v2/trunk/lib/libgfarm/gfarm/config_client.c 2012-11-30 16:05:29 UTC (rev 7228) @@ -151,7 +151,7 @@ } e = gfarm_known_network_list_add_local_host(); if (e != GFARM_ERR_NO_ERROR) { - gflog_debug(GFARM_MSG_UNFIXED, + gflog_debug(GFARM_MSG_1003570, "gfarm_known_network_list_add_local_host() failed: %s", gfarm_error_string(e)); return (e); Modified: gfarm_v2/trunk/lib/libgfarm/gfarm/gfarm_foreach.c =================================================================== --- gfarm_v2/trunk/lib/libgfarm/gfarm/gfarm_foreach.c 2012-11-30 15:52:01 UTC (rev 7227) +++ gfarm_v2/trunk/lib/libgfarm/gfarm/gfarm_foreach.c 2012-11-30 16:05:29 UTC (rev 7228) @@ -52,7 +52,7 @@ if (path == NULL) { if (e_save == GFARM_ERR_NO_ERROR) e_save = GFARM_ERR_NO_MEMORY; - gflog_debug(GFARM_MSG_UNFIXED, + gflog_debug(GFARM_MSG_1003588, "%s%s%s: no memory", file, slash, d); continue; } Modified: gfarm_v2/trunk/lib/libgfarm/gfarm/gfs_statfsnode.c =================================================================== --- gfarm_v2/trunk/lib/libgfarm/gfarm/gfs_statfsnode.c 2012-11-30 15:52:01 UTC (rev 7227) +++ gfarm_v2/trunk/lib/libgfarm/gfarm/gfs_statfsnode.c 2012-11-30 16:05:29 UTC (rev 7228) @@ -27,7 +27,7 @@ if ((e = gfm_client_connection_and_process_acquire_by_path(path, &gfm_server)) != GFARM_ERR_NO_ERROR) { - gflog_debug(GFARM_MSG_UNFIXED, + gflog_debug(GFARM_MSG_1003587, "gfm_client_connection_and_process_acquire_by_path " "failed: %s", gfarm_error_string(e)); return (e); Modified: gfarm_v2/trunk/lib/libgfarm/gfarm/iostat.c =================================================================== --- gfarm_v2/trunk/lib/libgfarm/gfarm/iostat.c 2012-11-30 15:52:01 UTC (rev 7227) +++ gfarm_v2/trunk/lib/libgfarm/gfarm/iostat.c 2012-11-30 16:05:29 UTC (rev 7228) @@ -80,14 +80,14 @@ if ((fd = open(path, O_CREAT|O_TRUNC|O_RDWR, 0644)) < 0) { e = gfarm_errno_to_error(errno); - gflog_error(GFARM_MSG_UNFIXED, + gflog_error(GFARM_MSG_1003591, "gfarm_iostat_mmap(%s) open failed: %s", path, gfarm_error_string(e)); return (e); } if (ftruncate(fd, size) < 0) { e = gfarm_errno_to_error(errno); - gflog_error(GFARM_MSG_UNFIXED, + gflog_error(GFARM_MSG_1003592, "gfarm_iostat_mmap(%s) truncate %zu failed: %s", path, size, gfarm_error_string(e)); close(fd); @@ -95,7 +95,7 @@ } if (write(fd, hp, sizeof(*hp)) < 0) { e = gfarm_errno_to_error(errno); - gflog_error(GFARM_MSG_UNFIXED, + gflog_error(GFARM_MSG_1003593, "gfarm_iostat_mmap(%s) write head failed: %s", path, gfarm_error_string(e)); close(fd); @@ -103,7 +103,7 @@ } if (write(fd, specp, sizeof(*specp) * nitem) < 0) { e = gfarm_errno_to_error(errno); - gflog_error(GFARM_MSG_UNFIXED, + gflog_error(GFARM_MSG_1003594, "gfarm_iostat_mmap(%s) write spec failed: %s", path, gfarm_error_string(e)); close(fd); @@ -113,7 +113,7 @@ if ((addr = mmap(NULL, size, PROT_WRITE|PROT_READ, MAP_SHARED, fd, 0)) == MAP_FAILED) { e = gfarm_errno_to_error(errno); - gflog_error(GFARM_MSG_UNFIXED, + gflog_error(GFARM_MSG_1003595, "gfarm_iostat_mmap(%s) mmap %zu failed: %s", path, size, gfarm_error_string(e)); close(fd); @@ -168,7 +168,7 @@ ip = gfarm_iostat_find_row(hp, sip, id, 0, hint, &i); if (!ip) { - gflog_error(GFARM_MSG_UNFIXED, + gflog_error(GFARM_MSG_1003596, "gfarm_iostat_clear_id(%s) id(%u) not found", hp->s_name, (unsigned int)id); return; @@ -197,13 +197,13 @@ if (!is_statfile_valid(hp, sip)) return; if (!ip) { - gflog_debug(GFARM_MSG_UNFIXED, "not initialized"); + gflog_debug(GFARM_MSG_1003597, "not initialized"); return; } i = ((char *)ip - (char *)sip) / hp->s_item_size; if (i < 0 || i >= hp->s_row) { - gflog_error(GFARM_MSG_UNFIXED, + gflog_error(GFARM_MSG_1003598, "gfarm_iostat_clear_ip(%s) i(%d) not found", hp->s_name, i); return; @@ -236,11 +236,11 @@ ip = gfarm_iostat_find_row(hp, sip, 0, hint, hp->s_rowcur, &i); if (ip) - gflog_debug(GFARM_MSG_UNFIXED, "found 1 %d into %p", i, ip); + gflog_debug(GFARM_MSG_1003599, "found 1 %d into %p", i, ip); if (!ip && hint) ip = gfarm_iostat_find_row(hp, sip, 0, 0, hint, &i); if (ip) - gflog_debug(GFARM_MSG_UNFIXED, "found 2 %d into %p", i, ip); + gflog_debug(GFARM_MSG_1003600, "found 2 %d into %p", i, ip); if (!ip) { ip = gfarm_iostat_find_row(hp, sip, 0, hp->s_rowcur, hp->s_row, &i); @@ -250,7 +250,7 @@ hp->s_rowmax = i + 1; } } else { - gflog_error(GFARM_MSG_UNFIXED, + gflog_error(GFARM_MSG_1003601, "gfarm_iostat_find_space(%s) small row %d", hp->s_name, hp->s_row); } @@ -269,7 +269,7 @@ return (NULL); if (i >= hp->s_row) { - gflog_error(GFARM_MSG_UNFIXED, + gflog_error(GFARM_MSG_1003602, "gfarm_iostat_get_ip(%s) too big id %d", hp->s_name, i); return (NULL); @@ -310,17 +310,17 @@ if (!is_statfile_valid(hp, sip)) return; if (!ip) { - gflog_debug(GFARM_MSG_UNFIXED, "not initialized"); + gflog_debug(GFARM_MSG_1003603, "not initialized"); return; } if (!ip->s_valid) { - gflog_error(GFARM_MSG_UNFIXED, + gflog_error(GFARM_MSG_1003604, "gfarm_iostat_stat_add(%s) invalid ip %p", hp->s_name, ip); return; } if (cat >= hp->s_nitem) { - gflog_error(GFARM_MSG_UNFIXED, + gflog_error(GFARM_MSG_1003605, "gfarm_iostat_stat_add(%s) too big cat %d", hp->s_name, cat); return; @@ -335,7 +335,7 @@ if (!is_statfile_valid(hp, sip)) return; if (!(ip = staticp->stat_local_ip)) { - gflog_debug(GFARM_MSG_UNFIXED, "not initialized"); + gflog_debug(GFARM_MSG_1003606, "not initialized"); return; } gfarm_iostat_stat_add(ip, cat, val); Modified: gfarm_v2/trunk/lib/libgfarm/gfarm/schedule.c =================================================================== --- gfarm_v2/trunk/lib/libgfarm/gfarm/schedule.c 2012-11-30 15:52:01 UTC (rev 7227) +++ gfarm_v2/trunk/lib/libgfarm/gfarm/schedule.c 2012-11-30 16:05:29 UTC (rev 7228) @@ -419,7 +419,7 @@ GFARM_MALLOC(net); if (net == NULL) { - gflog_debug(GFARM_MSG_UNFIXED, + gflog_debug(GFARM_MSG_1003589, "search_idle_network_list_add0: no memory"); return (GFARM_ERR_NO_MEMORY); } @@ -428,7 +428,7 @@ e = gfarm_addr_network_get(addr, &net->network); if (e != GFARM_ERR_NO_ERROR) { free(net); - gflog_debug(GFARM_MSG_UNFIXED, + gflog_debug(GFARM_MSG_1003590, "search_idle_network_list_add0: no memory"); return (GFARM_ERR_NO_MEMORY); } Modified: gfarm_v2/trunk/lib/libgfarm/gfutil/gfevent.c =================================================================== --- gfarm_v2/trunk/lib/libgfarm/gfutil/gfevent.c 2012-11-30 15:52:01 UTC (rev 7227) +++ gfarm_v2/trunk/lib/libgfarm/gfutil/gfevent.c 2012-11-30 16:05:29 UTC (rev 7228) @@ -563,7 +563,7 @@ gflog_debug(GFARM_MSG_1000781, "epoll_wait() failed: %s", strerror(save_errno)); #else - gflog_debug(GFARM_MSG_UNFIXED, + gflog_debug(GFARM_MSG_1003564, "select() failed: %s", strerror(save_errno)); #endif } Modified: gfarm_v2/trunk/lib/libgfarm/gfutil/thrsubr.c =================================================================== --- gfarm_v2/trunk/lib/libgfarm/gfutil/thrsubr.c 2012-11-30 15:52:01 UTC (rev 7227) +++ gfarm_v2/trunk/lib/libgfarm/gfutil/thrsubr.c 2012-11-30 16:05:29 UTC (rev 7228) @@ -36,7 +36,7 @@ int err = pthread_mutex_trylock(mutex); if (err != 0 && err != EBUSY) - gflog_fatal(GFARM_MSG_UNFIXED, "%s: %s mutex trylock: %s", + gflog_fatal(GFARM_MSG_1003565, "%s: %s mutex trylock: %s", where, what, strerror(err)); return (err == 0); } Modified: gfarm_v2/trunk/makes/.msgno =================================================================== --- gfarm_v2/trunk/makes/.msgno 2012-11-30 15:52:01 UTC (rev 7227) +++ gfarm_v2/trunk/makes/.msgno 2012-11-30 16:05:29 UTC (rev 7228) @@ -1 +1 @@ -1003563 \ No newline at end of file +1003680 \ No newline at end of file Modified: gfarm_v2/trunk/server/gfmd/fs.c =================================================================== --- gfarm_v2/trunk/server/gfmd/fs.c 2012-11-30 15:52:01 UTC (rev 7227) +++ gfarm_v2/trunk/server/gfmd/fs.c 2012-11-30 16:05:29 UTC (rev 7228) @@ -4485,7 +4485,7 @@ e = GFARM_ERR_TEXT_FILE_BUSY; } else if ((e = process_get_file_opening(process, cfd, &fo)) != GFARM_ERR_NO_ERROR) { - gflog_debug(GFARM_MSG_UNFIXED, + gflog_debug(GFARM_MSG_1003649, "process_get_file_opening() failed: %s", gfarm_error_string(e)); } else { Modified: gfarm_v2/trunk/server/gfmd/gfmd.c =================================================================== --- gfarm_v2/trunk/server/gfmd/gfmd.c 2012-11-30 15:52:01 UTC (rev 7227) +++ gfarm_v2/trunk/server/gfmd/gfmd.c 2012-11-30 16:05:29 UTC (rev 7228) @@ -1062,11 +1062,11 @@ (struct sockaddr *)&client_addr, &client_addr_size); if (client_socket < 0) { if (errno == EMFILE) { - gflog_reduced_warning(GFARM_MSG_UNFIXED, + gflog_reduced_warning(GFARM_MSG_1003607, &emfile_state, "accept: %s", strerror(EMFILE)); } else if (errno == ENFILE) { - gflog_reduced_warning(GFARM_MSG_UNFIXED, + gflog_reduced_warning(GFARM_MSG_1003608, &enfile_state, "accept: %s", strerror(ENFILE)); } else if (errno != EINTR) { @@ -1771,20 +1771,20 @@ /* for port / gfmd \0 */ GFARM_MALLOC_ARRAY(iostat_dirbuf, len); if (iostat_dirbuf == NULL) - gflog_fatal(GFARM_MSG_UNFIXED, "iostat_dirbuf:%s", + gflog_fatal(GFARM_MSG_1003609, "iostat_dirbuf:%s", gfarm_error_string(GFARM_ERR_NO_MEMORY)); len = snprintf(iostat_dirbuf, len, "%s-%d", gfarm_iostat_gfmd_path, gfmd_port); if (mkdir(iostat_dirbuf, 0755)) { if (errno != EEXIST) - gflog_fatal_errno(GFARM_MSG_UNFIXED, + gflog_fatal_errno(GFARM_MSG_1003610, "mkdir:%s", iostat_dirbuf); } strcat(iostat_dirbuf, "/gfmd"); e = gfarm_iostat_mmap(iostat_dirbuf, iostat_spec, GFARM_IOSTAT_TRAN_NITEM, table_size); if (e != GFARM_ERR_NO_ERROR) - gflog_fatal(GFARM_MSG_UNFIXED, + gflog_fatal(GFARM_MSG_1003611, "gfarm_iostat_mmap(%s): %s", iostat_dirbuf, gfarm_error_string(e)); } Modified: gfarm_v2/trunk/server/gfmd/gfmd_channel.c =================================================================== --- gfarm_v2/trunk/server/gfmd/gfmd_channel.c 2012-11-30 15:52:01 UTC (rev 7227) +++ gfarm_v2/trunk/server/gfmd/gfmd_channel.c 2012-11-30 16:05:29 UTC (rev 7228) @@ -98,19 +98,19 @@ GFARM_MALLOC(c); if (c == NULL) { - gflog_error(GFARM_MSG_UNFIXED, + gflog_error(GFARM_MSG_1003652, "%s: no memory for journal send closure", diag); return (GFARM_ERR_NO_MEMORY); } if ((err = pthread_mutex_init(&c->send_mutex, NULL)) != 0) { - gflog_error(GFARM_MSG_UNFIXED, + gflog_error(GFARM_MSG_1003653, "%s: pthread_mutex_init(%s): %s", diag, SEND_MUTEX_DIAG, strerror(err)); free(c); return (gfarm_errno_to_error(err)); } if ((err = pthread_cond_init(&c->send_end_cond, NULL)) != 0) { - gflog_error(GFARM_MSG_UNFIXED, + gflog_error(GFARM_MSG_1003654, "%s: pthread_cond_init(%s): %s", diag, SEND_END_COND_DIAG, strerror(err)); gfarm_mutex_destroy(&c->send_mutex, diag, SEND_MUTEX_DIAG); @@ -200,12 +200,12 @@ GFARM_MALLOC(gfmdc_peer); if (gfmdc_peer == NULL) { - gflog_error(GFARM_MSG_UNFIXED, + gflog_error(GFARM_MSG_1003655, "%s: no memory for per peer record", diag); return (GFARM_ERR_NO_MEMORY); } if ((err = pthread_mutex_init(&gfmdc_peer->mutex, NULL)) != 0) { - gflog_error(GFARM_MSG_UNFIXED, + gflog_error(GFARM_MSG_1003656, "%s: pthread_mutex_init(%s): %s", diag, PEER_RECORD_MUTEX_DIAG, strerror(err)); free(gfmdc_peer); Modified: gfarm_v2/trunk/server/gfmd/inode.c =================================================================== --- gfarm_v2/trunk/server/gfmd/inode.c 2012-11-30 15:52:01 UTC (rev 7227) +++ gfarm_v2/trunk/server/gfmd/inode.c 2012-11-30 16:05:29 UTC (rev 7228) @@ -746,7 +746,7 @@ host_is_disk_available_filter, &necessary_space, n_desired, &n_targets, &targets); if (e != GFARM_ERR_NO_ERROR) { - gflog_warning(GFARM_MSG_UNFIXED, "%s: inode %lld:%lld: " + gflog_warning(GFARM_MSG_1003643, "%s: inode %lld:%lld: " "cannot create %d replicas from %d hosts except %d: %s", diag, (long long)inode_get_number(inode), @@ -756,7 +756,7 @@ } if (n_targets < n_desired) - gflog_warning(GFARM_MSG_UNFIXED, "%s: inode %lld:%lld: " + gflog_warning(GFARM_MSG_1003644, "%s: inode %lld:%lld: " "fewer replicas (%d out of %d) will be created", diag, (long long)inode_get_number(inode), (long long)inode_get_gen(inode), @@ -765,7 +765,7 @@ e = inode_replication_new(inode, spool_host, targets[i], 1, NULL, &fr); if (e != GFARM_ERR_NO_ERROR) { - gflog_warning(GFARM_MSG_UNFIXED, + gflog_warning(GFARM_MSG_1003645, "%s: inode_replication_new: (%s, %lld:%lld): %s", diag, host_name(targets[i]), (long long)inode_get_number(inode), @@ -792,7 +792,7 @@ e = host_array_alloc(&nhosts, &hosts); if (e != GFARM_ERR_NO_ERROR) { - gflog_warning(GFARM_MSG_UNFIXED, "%s: inode %lld:%lld: " + gflog_warning(GFARM_MSG_1003646, "%s: inode %lld:%lld: " "cannot create %d replicas except %d: %s", diag, (long long)inode_get_number(inode), @@ -830,7 +830,7 @@ } GFARM_MALLOC_ARRAY(exceptions, n_exceptions); if (exceptions == NULL) { - gflog_warning(GFARM_MSG_UNFIXED, + gflog_warning(GFARM_MSG_1003647, "%s: no memory to schedule replicas except %d hosts", diag, n_exceptions); return; @@ -870,7 +870,7 @@ } else if (n_exceptions - being_removed < desired_replica_number) { - gflog_debug(GFARM_MSG_UNFIXED, + gflog_debug(GFARM_MSG_1003648, "%s: about to schedule " "ncopy-based replication for inode %lld:%lld@%s. " "number = %d (= %d - %d + %d)", diag, Modified: gfarm_v2/trunk/server/gfmd/mdhost.c =================================================================== --- gfarm_v2/trunk/server/gfmd/mdhost.c 2012-11-30 15:52:01 UTC (rev 7227) +++ gfarm_v2/trunk/server/gfmd/mdhost.c 2012-11-30 16:05:29 UTC (rev 7228) @@ -423,7 +423,7 @@ #ifdef PEER_REFCOUNT_DEBUG struct peer *peer = abstract_host_get_peer(&mh->ah, diag); - gflog_info(GFARM_MSG_UNFIXED, "%s(%d):%s(): mdhost_get_peer():%p", + gflog_info(GFARM_MSG_1003650, "%s(%d):%s(): mdhost_get_peer():%p", file, line, func, peer); return (peer); #else @@ -441,7 +441,7 @@ { abstract_host_put_peer(&mh->ah, peer); #ifdef PEER_REFCOUNT_DEBUG - gflog_info(GFARM_MSG_UNFIXED, "%s(%d):%s(): mdhost_put_peer(%p)", + gflog_info(GFARM_MSG_1003651, "%s(%d):%s(): mdhost_put_peer(%p)", file, line, func, peer); #endif } Modified: gfarm_v2/trunk/server/gfmd/peer.c =================================================================== --- gfarm_v2/trunk/server/gfmd/peer.c 2012-11-30 15:52:01 UTC (rev 7227) +++ gfarm_v2/trunk/server/gfmd/peer.c 2012-11-30 16:05:29 UTC (rev 7228) @@ -83,7 +83,7 @@ diag, "peer_closing_queue"); ++peer->refcount; #ifdef PEER_REFCOUNT_DEBUG - gflog_info(GFARM_MSG_UNFIXED, "%s(%d):%s(): peer_add_ref(%p):%d", + gflog_info(GFARM_MSG_1003613, "%s(%d):%s(): peer_add_ref(%p):%d", file, line, func, peer, peer->refcount); #endif gfarm_mutex_unlock(&peer_closing_queue.mutex, @@ -110,7 +110,7 @@ peer_closer_wakeup(peer); } #ifdef PEER_REFCOUNT_DEBUG - gflog_info(GFARM_MSG_UNFIXED, "%s(%d):%s(): peer_del_ref(%p):%d", + gflog_info(GFARM_MSG_1003614, "%s(%d):%s(): peer_del_ref(%p):%d", file, line, func, peer, peer->refcount); #endif Modified: gfarm_v2/trunk/server/gfmd/replica_check.c =================================================================== --- gfarm_v2/trunk/server/gfmd/replica_check.c 2012-11-30 15:52:01 UTC (rev 7227) +++ gfarm_v2/trunk/server/gfmd/replica_check.c 2012-11-30 16:05:29 UTC (rev 7228) @@ -72,12 +72,12 @@ log->suppressed = 1; switch (log->level) { case LOG_DEBUG: - gflog_debug(GFARM_MSG_UNFIXED, + gflog_debug(GFARM_MSG_1003615, "replica_check: suppress many `%s' debug messages", log->type); break; case LOG_INFO: - gflog_info(GFARM_MSG_UNFIXED, + gflog_info(GFARM_MSG_1003616, "replica_check: suppress many `%s' info messages", log->type); break; @@ -118,7 +118,7 @@ n_srcsp, srcs, host_is_disk_available_filter, &necessary_space, n_shortage, &n_dsts, &dsts); if (e != GFARM_ERR_NO_ERROR) { - gflog_error(GFARM_MSG_UNFIXED, + gflog_error(GFARM_MSG_1003617, "host_schedule_n_from_all_except, n_srcs=%d: %s", *n_srcsp, gfarm_error_string(e)); goto end; /* retry in next interval */ @@ -145,12 +145,12 @@ if (e == GFARM_ERR_RESOURCE_TEMPORARILY_UNAVAILABLE) { busy = 1; if (!log_is_suppressed(&log_unavail)) - gflog_debug(GFARM_MSG_UNFIXED, + gflog_debug(GFARM_MSG_1003618, "inode_replication_new, host=%s: %s", host_name(dst), gfarm_error_string(e)); /* next dst */ } else if (e != GFARM_ERR_NO_ERROR) { - gflog_error(GFARM_MSG_UNFIXED, + gflog_error(GFARM_MSG_1003619, "inode_replicating_new, host=%s: %s", host_name(dst), gfarm_error_string(e)); break; @@ -165,7 +165,7 @@ end: if (n_success < n_shortage) { if (!log_is_suppressed(&log_few)) - gflog_debug(GFARM_MSG_UNFIXED, + gflog_debug(GFARM_MSG_1003621, "replica_check: %lld:%lld:%s: fewer replicas, " "increase=%d/before=%d/desire=%d", (long long)inode_get_number(inode), @@ -173,7 +173,7 @@ user_name(inode_get_user(inode)), n_success, ncopy, n_desire); } else - gflog_notice(GFARM_MSG_UNFIXED, + gflog_notice(GFARM_MSG_1003622, "replica_check: %lld:%lld:%s: will be fixed, desire=%d", (long long)inode_get_number(inode), (long long)inode_get_gen(inode), @@ -199,7 +199,7 @@ if (inode == NULL || !inode_is_file(inode) || inode_get_gen(inode) != info->gen) { - gflog_debug(GFARM_MSG_UNFIXED, + gflog_debug(GFARM_MSG_1003623, "%lld:%lld was changed, ignore replica_check", (long long)info->inum, (long long)info->gen); return (GFARM_ERR_NO_ERROR); /* ignore */ @@ -216,13 +216,13 @@ if (inode_get_size(inode) == 0) return (GFARM_ERR_NO_ERROR); /* normally */ else if (inode_has_no_replica(inode)) { - gflog_warning(GFARM_MSG_UNFIXED, + gflog_warning(GFARM_MSG_1003624, "replica_check: %lld:%lld:%s: lost all replicas", (long long)info->inum, (long long)info->gen, user_name(inode_get_user(inode))); return (GFARM_ERR_NO_ERROR); /* not retry */ } else if (!log_is_suppressed(&log_hosts_down)) { - gflog_info(GFARM_MSG_UNFIXED, + gflog_info(GFARM_MSG_1003625, "replica_check: %lld:%lld:%s: hosts are down", (long long)info->inum, (long long)info->gen, user_name(inode_get_user(inode))); @@ -231,7 +231,7 @@ } if (ncopy > info->desired_number) { if (!log_is_suppressed(&log_too_many)) - gflog_debug(GFARM_MSG_UNFIXED, + gflog_debug(GFARM_MSG_1003626, "replica_check: %lld:%lld:%s: " "too many replicas, %d > %d", (long long)info->inum, (long long)info->gen, @@ -241,7 +241,7 @@ return (GFARM_ERR_NO_ERROR); } if (inode_is_opened_for_writing(inode)) { - gflog_debug(GFARM_MSG_UNFIXED, + gflog_debug(GFARM_MSG_1003627, "replica_check: %lld:%lld:%s: " "opened in write mode, ignored", (long long)info->inum, (long long)info->gen, @@ -251,7 +251,7 @@ /* available replicas for source */ e = inode_replica_list(inode, &n_srcs, &srcs); if (e != GFARM_ERR_NO_ERROR) { /* no memory */ - gflog_error(GFARM_MSG_UNFIXED, + gflog_error(GFARM_MSG_1003628, "replica_check: %lld:%lld:%s: replica_list: %s", (long long)info->inum, (long long)info->gen, user_name(inode_get_user(inode)), gfarm_error_string(e)); @@ -261,7 +261,7 @@ if (n_srcs <= 0) { free(srcs); if (!log_is_suppressed(&log_hosts_down)) - gflog_info(GFARM_MSG_UNFIXED, + gflog_info(GFARM_MSG_1003629, "replica_check: %lld:%lld:%s: hosts are down", (long long)info->inum, (long long)info->gen, user_name(inode_get_user(inode))); @@ -305,7 +305,7 @@ replica_check_stack_size = REPLICA_CHECK_DIRENTS_BUFCOUNT; GFARM_MALLOC_ARRAY(replica_check_stack, replica_check_stack_size); if (replica_check_stack == NULL) { - gflog_error(GFARM_MSG_UNFIXED, "replica_check: no memory"); + gflog_error(GFARM_MSG_1003630, "replica_check: no memory"); return (0); } return (1); @@ -409,7 +409,7 @@ } if (e != GFARM_ERR_NO_ERROR) { need_to_retry = 1; - gflog_debug(GFARM_MSG_UNFIXED, + gflog_debug(GFARM_MSG_1003631, "replica_check_fix(): %s", gfarm_error_string(e)); } @@ -430,7 +430,7 @@ table_size = inode_table_current_size(); replica_check_giant_unlock(); - RC_LOG_INFO(GFARM_MSG_UNFIXED, "replica_check: start"); + RC_LOG_INFO(GFARM_MSG_1003632, "replica_check: start"); for (inum = root_inum;;) { need_to_retry = replica_check_main_dir(inum, &count); inum++; /* a next directory */ @@ -442,7 +442,7 @@ break; } } - RC_LOG_INFO(GFARM_MSG_UNFIXED, + RC_LOG_INFO(GFARM_MSG_1003633, "replica_check: finished, files=%llu", (unsigned long long)count); return (need_to_retry); } @@ -473,7 +473,7 @@ targets_size = MAX_TARGETS_SIZE; GFARM_MALLOC_ARRAY(targets, targets_size); if (targets == NULL) { - gflog_error(GFARM_MSG_UNFIXED, "replica_check: no memory"); + gflog_error(GFARM_MSG_1003634, "replica_check: no memory"); return (0); } return (1); @@ -494,7 +494,7 @@ gettimeofday(&targets[i], NULL); targets[i].tv_sec += sec; #ifdef DEBUG_REPLICA_CHECK - RC_LOG_DEBUG(GFARM_MSG_UNFIXED, + RC_LOG_DEBUG(GFARM_MSG_1003635, "replica_check: add targets[%ld]=%ld.%06ld", (long)i, (long)targets[i].tv_sec, (long)targets[i].tv_usec); @@ -516,7 +516,7 @@ *next = targets[0]; saved_tv = *next; #ifdef DEBUG_REPLICA_CHECK - RC_LOG_DEBUG(GFARM_MSG_UNFIXED, + RC_LOG_DEBUG(GFARM_MSG_1003636, "replica_check: targets[0]=%ld.%06ld", (long)next->tv_sec, (long)next->tv_usec); #endif @@ -528,7 +528,7 @@ #ifdef DEBUG_REPLICA_CHECK for (i = 0; i < targets_num; i++) - RC_LOG_DEBUG(GFARM_MSG_UNFIXED, + RC_LOG_DEBUG(GFARM_MSG_1003637, "replica_check: targets[%ld]=%ld.%06ld", (long)i, (long)targets[i].tv_sec, (long)targets[i].tv_usec); #endif @@ -627,7 +627,7 @@ after = next; gfarm_timeval_sub(&after, &now); - RC_LOG_DEBUG(GFARM_MSG_UNFIXED, + RC_LOG_DEBUG(GFARM_MSG_1003638, "replica_check: next=%ld.%06ld" "(after %ld.%06ld)", (long)next.tv_sec, (long)next.tv_usec, @@ -674,7 +674,7 @@ gfarm_mutex_lock(&replica_check_mutex, diag, REPLICA_CHECK_DIAG); if (replica_check_initialized) { #ifdef DEBUG_REPLICA_CHECK - RC_LOG_DEBUG(GFARM_MSG_UNFIXED, "%s is called", diag); + RC_LOG_DEBUG(GFARM_MSG_1003639, "%s is called", diag); #endif replica_check_targets_add(sec); gfarm_cond_signal( @@ -682,7 +682,7 @@ } #ifdef DEBUG_REPLICA_CHECK else - RC_LOG_DEBUG(GFARM_MSG_UNFIXED, "%s is ignored", diag); + RC_LOG_DEBUG(GFARM_MSG_1003640, "%s is ignored", diag); #endif gfarm_mutex_unlock(&replica_check_mutex, diag, REPLICA_CHECK_DIAG); } @@ -764,7 +764,7 @@ static int started = 0; if (!gfarm_replica_check) { - gflog_notice(GFARM_MSG_UNFIXED, "replica_check is disabled"); + gflog_notice(GFARM_MSG_1003642, "replica_check is disabled"); return; } if (started) Modified: gfarm_v2/trunk/server/gfmd/xattr.c =================================================================== --- gfarm_v2/trunk/server/gfmd/xattr.c 2012-11-30 15:52:01 UTC (rev 7227) +++ gfarm_v2/trunk/server/gfmd/xattr.c 2012-11-30 16:05:29 UTC (rev 7228) @@ -214,25 +214,25 @@ } e = inode_xattr_to_uint(value, size, &n, &all_digit); if (e != GFARM_ERR_NO_ERROR) { - gflog_debug(GFARM_MSG_UNFIXED, + gflog_debug(GFARM_MSG_1003657, "xattr_to_uint for gfarm.ncopy: %s", gfarm_error_string(e)); return (e); } num_new = n; /* uint to int */ if (num_new < 0) { - gflog_debug(GFARM_MSG_UNFIXED, "overflow for gfarm.ncopy"); + gflog_debug(GFARM_MSG_1003658, "overflow for gfarm.ncopy"); return (GFARM_ERR_RESULT_OUT_OF_RANGE); } if (!all_digit) { - gflog_debug(GFARM_MSG_UNFIXED, + gflog_debug(GFARM_MSG_1003659, "invalid format for gfarm.ncopy"); return (GFARM_ERR_INVALID_ARGUMENT); } if (inode_has_desired_number(inode, &num_old) && num_new == num_old) { *have = 1; *change = 0; - gflog_debug(GFARM_MSG_UNFIXED, + gflog_debug(GFARM_MSG_1003660, "gfarm.ncopy=%d: not changed", num_new); return (GFARM_ERR_NO_ERROR); } @@ -270,7 +270,7 @@ xmlMode, inode, attrname, *valuep, size, &have_ncopy, &change_ncopy); if (e != GFARM_ERR_NO_ERROR) { - gflog_debug(GFARM_MSG_UNFIXED, + gflog_debug(GFARM_MSG_1003661, "xattr_check_desired_number(): %s", gfarm_error_string(e)); return (e); } else if (have_ncopy && !change_ncopy) Modified: gfarm_v2/trunk/server/gfsd/gfsd.c =================================================================== --- gfarm_v2/trunk/server/gfsd/gfsd.c 2012-11-30 15:52:01 UTC (rev 7227) +++ gfarm_v2/trunk/server/gfsd/gfsd.c 2012-11-30 16:05:29 UTC (rev 7228) @@ -360,7 +360,7 @@ if (e != GFARM_ERR_NO_ERROR) { if (timed_out) { - gflog_error(GFARM_MSG_UNFIXED, + gflog_error(GFARM_MSG_1003668, "connecting to gfmd at %s:%d failed: %s", gfarm_ctxp->metadb_server_name, gfarm_ctxp->metadb_server_port, @@ -395,7 +395,7 @@ gfarm_error_string(e)); return (e); } - gflog_reduced_error(GFARM_MSG_UNFIXED, &hnamelog, + gflog_reduced_error(GFARM_MSG_1003669, &hnamelog, "cannot set canonical hostname of this node (%s), " "sleep %d sec: %s", canonical_self_name, sleep_interval, gfarm_error_string(e)); @@ -3850,7 +3850,7 @@ GFARM_REALLOC_ARRAY(fds, fds, n_alloc); GFARM_REALLOC_ARRAY(fd_rep_map, fd_rep_map, n_alloc); if (fds == NULL || fd_rep_map == NULL) { - gflog_fatal(GFARM_MSG_UNFIXED, + gflog_fatal(GFARM_MSG_1003670, "no memory for %d descriptors, " "current = %d, alloc = %d", n, nfds, n_alloc); @@ -3872,14 +3872,14 @@ nfound = poll(fds, n, gfarm_metadb_heartbeat_interval * 2 * 1000); if (nfound == 0) { - gflog_error(GFARM_MSG_UNFIXED, + gflog_error(GFARM_MSG_1003671, "back channel: gfmd is down"); return (0); } if (nfound < 0) { if (errno == EINTR || errno == EAGAIN) continue; - fatal_errno(GFARM_MSG_UNFIXED, "back channel poll"); + fatal_errno(GFARM_MSG_1003672, "back channel poll"); } for (i = 1; i < n; i++) { if (fds[i].revents == 0) @@ -3887,7 +3887,7 @@ e = replication_result_notify(conn, async, fd_rep_map[i]->q); if (e != GFARM_ERR_NO_ERROR) { - gflog_error(GFARM_MSG_UNFIXED, + gflog_error(GFARM_MSG_1003673, "back channel: " "communication error: %s", gfarm_error_string(e)); @@ -4019,7 +4019,7 @@ e = gfarm_iostat_mmap(iostat_dirbuf, iostat_spec, GFARM_IOSTAT_IO_NITEM, gfarm_iostat_max_client); if (e != GFARM_ERR_NO_ERROR) - gflog_error(GFARM_MSG_UNFIXED, + gflog_error(GFARM_MSG_1003674, "gfarm_iostat_mmap(%s): %s", iostat_dirbuf, gfarm_error_string(e)); } @@ -4147,7 +4147,7 @@ break; } if (e != GFARM_ERR_NO_ERROR) { - gflog_error(GFARM_MSG_UNFIXED, + gflog_error(GFARM_MSG_1003675, "back channel disconnected " "during a reply: %s", gfarm_error_string(e)); @@ -4664,7 +4664,7 @@ len += 1 + 16 + 1; /* "-NAME\0" */ GFARM_MALLOC_ARRAY(iostat_dirbuf, len); if (iostat_dirbuf == NULL) - gflog_fatal(GFARM_MSG_UNFIXED, "iostat_dirbuf:%s", + gflog_fatal(GFARM_MSG_1003676, "iostat_dirbuf:%s", gfarm_error_string(GFARM_ERR_NO_MEMORY)); iostat_dirlen = snprintf(iostat_dirbuf, len, "%s%s%s-%d/", @@ -4673,11 +4673,11 @@ (unsigned int) self_info.port); if (mkdir(iostat_dirbuf, 0755)) { if (errno != EEXIST) - gflog_fatal_errno(GFARM_MSG_UNFIXED, + gflog_fatal_errno(GFARM_MSG_1003677, "mkdir:%s", iostat_dirbuf); } else if (chown(iostat_dirbuf, gfsd_uid, -1)) { if (errno != EEXIST) - gflog_fatal_errno(GFARM_MSG_UNFIXED, + gflog_fatal_errno(GFARM_MSG_1003678, "chown:%s", iostat_dirbuf); } } @@ -4755,7 +4755,7 @@ e = gfarm_iostat_mmap(iostat_dirbuf, iostat_spec, GFARM_IOSTAT_IO_NITEM, gfarm_iostat_max_client); if (e != GFARM_ERR_NO_ERROR) - gflog_error(GFARM_MSG_UNFIXED, + gflog_error(GFARM_MSG_1003679, "gfarm_iostat_mmap(%s): %s", iostat_dirbuf, gfarm_error_string(e)); } Modified: gfarm_v2/trunk/server/gfsd/spck.c =================================================================== --- gfarm_v2/trunk/server/gfsd/spck.c 2012-11-30 15:52:01 UTC (rev 7227) +++ gfarm_v2/trunk/server/gfsd/spck.c 2012-11-30 16:05:29 UTC (rev 7228) @@ -531,7 +531,7 @@ { struct gfarm_hash_table *hash_ok; /* valid files */ - gflog_debug(GFARM_MSG_UNFIXED, "spool_check_level=%s", + gflog_debug(GFARM_MSG_1003680, "spool_check_level=%s", gfarm_spool_check_level_get_by_name()); spool_check_level = gfarm_spool_check_level_get(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |