rpms/cld/devel cld-test.patch, 1.1.2.4, 1.1.2.5 cld.spec, 1.4.2.4, 1.4.2.5
Pete Zaitcev
zaitcev at fedoraproject.org
Wed Jul 22 18:47:40 UTC 2009
Author: zaitcev
Update of /cvs/pkgs/rpms/cld/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25619
Modified Files:
Tag: private-zaitcev-bz512560
cld-test.patch cld.spec
Log Message:
Bump to test 5.
cld-test.patch:
lib/cldc.c | 38 +++++++++++++++++----
server/cld.h | 1
server/cldb.c | 15 +++-----
server/msg.c | 69 +++++++++++++++++++++++++++++++++------
server/server.c | 86 +++++++++++++++++++++++++++++++++++--------------
server/session.c | 56 +++++++++++++++++++++++--------
server/util.c | 17 +++++----
test/load-file-event.c | 2 -
test/start-daemon | 2 -
9 files changed, 211 insertions(+), 75 deletions(-)
Index: cld-test.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cld/devel/Attic/cld-test.patch,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -p -r1.1.2.4 -r1.1.2.5
--- cld-test.patch 22 Jul 2009 05:19:13 -0000 1.1.2.4
+++ cld-test.patch 22 Jul 2009 18:47:38 -0000 1.1.2.5
@@ -132,7 +132,7 @@ index cb73523..cef9092 100644
rc = db_data->get(db_data, txn, &key, &val, rmw ? DB_RMW : 0);
diff --git a/server/msg.c b/server/msg.c
-index 2877348..bb46fca 100644
+index 2877348..12c6a90 100644
--- a/server/msg.c
+++ b/server/msg.c
@@ -31,6 +31,23 @@ enum {
@@ -274,7 +274,19 @@ index 2877348..bb46fca 100644
resp_rc = CLE_OOM;
goto err_out;
}
-@@ -913,6 +947,7 @@ static void try_commit_data(struct msg_params *mp,
+@@ -805,6 +839,11 @@ static void try_commit_data(struct msg_params *mp,
+ break;
+ }
+
++ if (debugging)
++ cldlog(LOG_DEBUG,
++ " data scan: end %d nseg %u last %u len %u/%u\n",
++ have_end_seg, nseg, last_seg, tmp_size, data_size);
++
+ /* return if data stream not yet 100% received */
+ if (!have_end_seg || tmp_size < data_size)
+ return; /* nothing to do */
+@@ -913,6 +952,7 @@ static void try_commit_data(struct msg_params *mp,
inode->size = GUINT32_TO_LE(data_size);
/* update inode */
@@ -282,7 +294,18 @@ index 2877348..bb46fca 100644
rc = inode_touch(txn, inode);
if (rc) {
resp_rc = CLE_DB_ERR;
-@@ -1221,6 +1256,7 @@ void msg_del(struct msg_params *mp)
+@@ -961,6 +1001,10 @@ void msg_data(struct msg_params *mp)
+ if (mp->msg_len < (sizeof(*msg) + seg_len))
+ return;
+
++ if (debugging)
++ cldlog(LOG_DEBUG, " data strid %016llx\n",
++ (unsigned long long) msg->strid);
++
+ /* search for PUT message with strid == our strid; that is how we
+ * associate DATA messages with the initial PUT msg
+ */
+@@ -1221,6 +1265,7 @@ void msg_del(struct msg_params *mp)
resp_rc = CLE_DB_ERR;
goto err_out;
}
@@ -290,7 +313,7 @@ index 2877348..bb46fca 100644
/* read parent inode data */
rc = cldb_data_get(txn, cldino_from_le(parent->inum),
-@@ -1239,6 +1275,7 @@ void msg_del(struct msg_params *mp)
+@@ -1239,6 +1284,7 @@ void msg_del(struct msg_params *mp)
resp_rc = CLE_DB_ERR;
goto err_out;
}
@@ -298,7 +321,7 @@ index 2877348..bb46fca 100644
/* prevent deletion of non-empty dirs */
if (GUINT32_FROM_LE(ino->flags) & CIFL_DIR) {
-@@ -1311,7 +1348,7 @@ void msg_del(struct msg_params *mp)
+@@ -1311,7 +1357,7 @@ void msg_del(struct msg_params *mp)
/* remove record from inode's directory data */
if (!dirdata_delete(&parent_data, &parent_len,
pinfo.base, pinfo.base_len)) {
@@ -307,7 +330,7 @@ index 2877348..bb46fca 100644
resp_rc = CLE_DB_ERR;
goto err_out;
}
-@@ -1327,6 +1364,7 @@ void msg_del(struct msg_params *mp)
+@@ -1327,6 +1373,7 @@ void msg_del(struct msg_params *mp)
parent->size = GUINT32_TO_LE(parent_len);
/* update parent dir inode */
@@ -562,7 +585,7 @@ index e4b027d..fbad5c1 100644
free(inode);
} else {
diff --git a/server/session.c b/server/session.c
-index a3332e9..1962b22 100644
+index a3332e9..d929d3f 100644
--- a/server/session.c
+++ b/server/session.c
@@ -355,7 +355,7 @@ int session_dispose(DB_TXN *txn, struct session *sess)
@@ -594,16 +617,51 @@ index a3332e9..1962b22 100644
SIDARG(outpkt->sid),
opstr(outmsg->op),
(unsigned long long)
-@@ -570,7 +570,7 @@ bool sess_sendmsg(struct session *sess, const void *msg_, size_t msglen,
+@@ -569,11 +569,38 @@ bool sess_sendmsg(struct session *sess, const void *msg_, size_t msglen,
+
if (debugging) {
const struct cld_msg_hdr *hdr = msg_;
-
+-
- syslog(LOG_DEBUG, "sendmsg: sid " SIDFMT ", op %s, msglen %u",
-+ cldlog(LOG_DEBUG, "sendmsg: sid " SIDFMT ", op %s, msglen %u\n",
- SIDARG(sess->sid),
- opstr(hdr->op),
- (unsigned int) msglen);
-@@ -646,7 +646,7 @@ void msg_ack(struct msg_params *mp)
+- SIDARG(sess->sid),
+- opstr(hdr->op),
+- (unsigned int) msglen);
++ const struct cld_msg_resp *rsp;
++
++ switch (hdr->op) {
++ /* This is the command set that gets to cldc_rx_generic */
++ case cmo_nop:
++ case cmo_close:
++ case cmo_del:
++ case cmo_lock:
++ case cmo_unlock:
++ case cmo_trylock:
++ case cmo_put:
++ case cmo_new_sess:
++ case cmo_end_sess:
++ case cmo_open:
++ case cmo_data_s:
++ case cmo_get_meta:
++ case cmo_get:
++ rsp = (struct cld_msg_resp *) msg_;
++ cldlog(LOG_DEBUG, "sendmsg: "
++ "sid " SIDFMT ", op %s, msglen %u, code %u\n",
++ SIDARG(sess->sid),
++ opstr(hdr->op),
++ (unsigned int) msglen,
++ GUINT32_FROM_LE(rsp->code));
++ break;
++ default:
++ cldlog(LOG_DEBUG,
++ "sendmsg: sid " SIDFMT ", op %s, msglen %u\n",
++ SIDARG(sess->sid),
++ opstr(hdr->op),
++ (unsigned int) msglen);
++ }
+ }
+
+ op = op_alloc(sizeof(*outpkt) + msglen + SHA_DIGEST_LENGTH);
+@@ -646,7 +673,7 @@ void msg_ack(struct msg_params *mp)
continue;
if (debugging)
@@ -612,7 +670,7 @@ index a3332e9..1962b22 100644
(unsigned long long) GUINT64_FROM_LE(outpkt->seqid));
/* remove and delete the ack'd msg; call ack'd callback */
-@@ -740,7 +740,8 @@ err_out:
+@@ -740,7 +767,8 @@ err_out:
authsign(outpkt, alloc_len);
if (debugging)
@@ -622,7 +680,7 @@ index a3332e9..1962b22 100644
SIDARG(outpkt->sid),
opstr(resp->hdr.op),
(unsigned long long) GUINT64_FROM_LE(outpkt->seqid));
-@@ -749,7 +750,7 @@ err_out:
+@@ -749,7 +777,7 @@ err_out:
mp->cli->addr_len, outpkt, alloc_len);
if (debugging)
@@ -631,7 +689,7 @@ index a3332e9..1962b22 100644
}
static void end_sess_done(struct session_outpkt *outpkt)
-@@ -804,7 +805,7 @@ err_out_noabort:
+@@ -804,7 +832,7 @@ err_out_noabort:
/*
* Fill ss with contents of the database.
@@ -640,7 +698,7 @@ index a3332e9..1962b22 100644
*/
int sess_load(GHashTable *ss)
{
-@@ -876,7 +877,7 @@ static int sess_load_db(GHashTable *ss, DB_TXN *txn)
+@@ -876,7 +904,7 @@ static int sess_load_db(GHashTable *ss, DB_TXN *txn)
session_decode(sess, &raw_sess);
if (debugging)
Index: cld.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cld/devel/cld.spec,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -u -p -r1.4.2.4 -r1.4.2.5
--- cld.spec 22 Jul 2009 05:19:13 -0000 1.4.2.4
+++ cld.spec 22 Jul 2009 18:47:39 -0000 1.4.2.5
@@ -1,6 +1,6 @@
Name: cld
Version: 0.2
-Release: 0.4.gc5b5f962.bz512560.4%{?dist}
+Release: 0.4.gc5b5f962.bz512560.5%{?dist}
Summary: Coarse locking daemon
Group: System Environment/Base
@@ -102,8 +102,8 @@ fi
%{_includedir}/*
%changelog
-* Tue Jul 21 2009 Pete Zaitcev <zaitcev at redhat.com>
-- Testing, bump to 0.2-0.4.gc5b5f962.bz512560.4
+* Wed Jul 22 2009 Pete Zaitcev <zaitcev at redhat.com>
+- Testing, bump to 0.2-0.4.gc5b5f962.bz512560.5
* Tue Jul 21 2009 Jeff Garzik <jgarzik at redhat.com> - 0.2-0.4.gc5b5f962
- rebuild for koji silliness
More information about the fedora-extras-commits
mailing list