[prev in list] [next in list] [prev in thread] [next in thread] 

List:       sanlock-devel
Subject:    src/delta_lease.c src/direct.c src/host_id.c src/paxos_lease.c src/paxos_lease.h
From:       teigland () fedoraproject ! org (David Teigland)
Date:       2011-04-08 18:59:20
Message-ID: 20110408185920.4B6E7120263 () lists ! fedorahosted ! org
[Download RAW message or body]

 src/delta_lease.c |    6 +++---
 src/direct.c      |   11 ++++-------
 src/host_id.c     |    2 ++
 src/paxos_lease.c |   10 ++++++----
 src/paxos_lease.h |    3 ++-
 5 files changed, 17 insertions(+), 15 deletions(-)

New commits:
commit e9ad19ab206e48fcecd09c69da9efe0740797643
Author: David Teigland <teigland at redhat.com>
Date:   Fri Apr 8 13:58:18 2011 -0500

    sanlock: debug message changes
    
    remove the host_id renewal messages since they fill up the log

diff --git a/src/delta_lease.c b/src/delta_lease.c
index 003b2f5..6804e78 100644
--- a/src/delta_lease.c
+++ b/src/delta_lease.c
@@ -211,7 +211,7 @@ int delta_lease_renew(struct space *sp, struct sync_disk *disk,
 	uint64_t new_ts;
 	int error, delay;
 
-	log_space(sp, "delta_renew %llu begin", (unsigned long long)host_id);
+	/* log_space(sp, "delta_renew %llu begin", (unsigned long long)host_id); */
 
 	error = delta_lease_leader_read(disk, space_name, host_id, &leader);
 	if (error < 0)
@@ -229,7 +229,7 @@ int delta_lease_renew(struct space *sp, struct sync_disk *disk,
 	leader.timestamp = new_ts;
 	leader.checksum = leader_checksum(&leader);
 
-	log_space(sp, "delta_renew write new %llu", (unsigned long long)new_ts);
+	/* log_space(sp, "delta_renew write new %llu", (unsigned long long)new_ts); */
 
 	error = write_sector(disk, host_id - 1, (char *)&leader,
 			     sizeof(struct leader_record),
@@ -238,7 +238,7 @@ int delta_lease_renew(struct space *sp, struct sync_disk *disk,
 		return error;
 
 	delay = 2 * to.io_timeout_seconds;
-	log_space(sp, "delta_renew sleep 2d %d", delay);
+	/* log_space(sp, "delta_renew sleep 2d %d", delay); */
 	sleep(delay);
 
 	error = delta_lease_leader_read(disk, space_name, host_id, &leader);
diff --git a/src/direct.c b/src/direct.c
index bb36e2e..6bd10e7 100644
--- a/src/direct.c
+++ b/src/direct.c
@@ -90,24 +90,21 @@ static int do_paxos_action(void)
 		case ACT_ACQUIRE:
 			rv = paxos_lease_acquire(token, 0, &leader_ret, 0, com.num_hosts);
 			if (rv < 0) {
-				log_tool("cannot acquire lease on %s",
-				 	 token->r.name);
+				log_tool("cannot acquire lease on %s", token->r.name);
 				return -1;
 			}
 			break;
 
 		case ACT_RELEASE:
-			rv = paxos_lease_leader_read(token, &leader_read);
+			rv = paxos_lease_leader_read(token, &leader_read, "direct_release");
 			if (rv < 0) {
-				log_tool("cannot read lease on %s",
-				 	 token->r.name);
+				log_tool("cannot read lease on %s", token->r.name);
 				return -1;
 			}
 
 			rv = paxos_lease_release(token, &leader_read, &leader_ret);
 			if (rv < 0) {
-				log_tool("cannot release lease on %s",
-				 	 token->r.name);
+				log_tool("cannot release lease on %s", token->r.name);
 				return -1;
 			}
 			break;
diff --git a/src/host_id.c b/src/host_id.c
index 242779a..4f9091a 100644
--- a/src/host_id.c
+++ b/src/host_id.c
@@ -263,9 +263,11 @@ static void *host_id_thread(void *arg_in)
 				sp->lease_status.max_renewal_time = t;
 			}
 
+			/*
 			log_space(sp, "host_id %llu renewal %llu interval %d",
 				  (unsigned long long)sp->host_id,
 				  (unsigned long long)t, good_diff);
+			*/
 
 			if (!sp->thread_stop)
 				update_watchdog_file(sp, t);
diff --git a/src/paxos_lease.c b/src/paxos_lease.c
index bd06d1f..b4797b2 100644
--- a/src/paxos_lease.c
+++ b/src/paxos_lease.c
@@ -464,7 +464,8 @@ static int leaders_match(struct leader_record *a, struct leader_record *b)
 	return 0;
 }
 
-int paxos_lease_leader_read(struct token *token, struct leader_record *leader_ret)
+int paxos_lease_leader_read(struct token *token, struct leader_record *leader_ret,
+			    const char *caller)
 {
 	struct leader_record prev_leader;
 	struct leader_record *leaders;
@@ -551,8 +552,9 @@ int paxos_lease_leader_read(struct token *token, struct leader_record *leader_re
 		goto fail;
 	}
 
-	log_token(token, "leader_read owner %llu lver %llu hosts %llu "
+	log_token(token, "%s leader_read owner %llu lver %llu hosts %llu "
 		  "time %llu res %s",
+		  caller ? caller : "unknown",
 		  (unsigned long long)prev_leader.owner_id,
 		  (unsigned long long)prev_leader.lver,
 		  (unsigned long long)prev_leader.num_hosts,
@@ -611,7 +613,7 @@ int paxos_lease_acquire(struct token *token, int force,
 	log_token(token, "paxos_acquire begin lver %llu force %d",
 		  (unsigned long long)acquire_lver, force);
 
-	error = paxos_lease_leader_read(token, &prev_leader);
+	error = paxos_lease_leader_read(token, &prev_leader, "paxos_acquire");
 	if (error < 0)
 		goto out;
 
@@ -859,7 +861,7 @@ int paxos_lease_release(struct token *token,
 	struct leader_record leader;
 	int error;
 
-	error = paxos_lease_leader_read(token, &leader);
+	error = paxos_lease_leader_read(token, &leader, "paxos_release");
 	if (error < 0) {
 		log_errot(token, "release error cannot read leader");
 		goto out;
diff --git a/src/paxos_lease.h b/src/paxos_lease.h
index 1f87fc0..afdfe58 100644
--- a/src/paxos_lease.h
+++ b/src/paxos_lease.h
@@ -11,7 +11,8 @@
 
 uint32_t leader_checksum(struct leader_record *lr);
 int majority_disks(struct token *token, int num);
-int paxos_lease_leader_read(struct token *token, struct leader_record *leader_ret);
+int paxos_lease_leader_read(struct token *token, struct leader_record *leader_ret,
+			    const char *caller);
 int paxos_lease_acquire(struct token *token, int force,
 		        struct leader_record *leader_ret,
 		        uint64_t acquire_lver,



[prev in list] [next in list] [prev in thread] [next in thread]