From 51a02b174720df9cf9628a541c71959f9bd99d5c Mon Sep 17 00:00:00 2001
From: David Teigland <teigland@redhat.com>
Date: Oct 28 2013 20:42:01 +0000
Subject: sanlock: add some acquire error descriptions


Add some short user readable descriptions to
the error log messages during acquire.

Signed-off-by: David Teigland <teigland@redhat.com>

---

diff --git a/src/cmd.c b/src/cmd.c
index 38fc6ad..cea7f58 100644
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -118,6 +118,38 @@ static int check_new_tokens_space(struct client *cl,
 	return 0;
 }
 
+static const char *acquire_error_str(int error)
+{
+	switch (error) {
+	case SANLK_ACQUIRE_IDLIVE:
+	case SANLK_ACQUIRE_OWNED:
+	case SANLK_ACQUIRE_OTHER:
+		return "lease owned by other host";
+
+	case SANLK_ACQUIRE_SHRETRY:
+		return "shared lease contention";
+
+	case SANLK_DBLOCK_READ:
+	case SANLK_DBLOCK_WRITE:
+	case SANLK_LEADER_READ:
+	case SANLK_LEADER_WRITE:
+		return "lease io error";
+
+	case SANLK_LEADER_DIFF:
+	case SANLK_LEADER_MAGIC:
+	case SANLK_LEADER_VERSION:
+	case SANLK_LEADER_SECTORSIZE:
+	case SANLK_LEADER_LOCKSPACE:
+	case SANLK_LEADER_RESOURCE:
+	case SANLK_LEADER_NUMHOSTS:
+	case SANLK_LEADER_CHECKSUM:
+		return "lease data invalid";
+
+	default:
+		return "";
+	};
+}
+
 static void cmd_acquire(struct task *task, struct cmd_args *ca)
 {
 	struct client *cl;
@@ -342,8 +374,8 @@ static void cmd_acquire(struct task *task, struct cmd_args *ca)
 				lvl = LOG_ERR;
 			}
 			log_level(0, token->token_id, NULL, lvl,
-				  "cmd_acquire %d,%d,%d acquire_token %d",
-				  cl_ci, cl_fd, cl_pid, rv);
+				  "cmd_acquire %d,%d,%d acquire_token %d %s",
+				  cl_ci, cl_fd, cl_pid, rv, acquire_error_str(rv));
 			result = rv;
 			goto done;
 		}