From ab7dbd2ff8abd97cd26662346137c980cef35ba6 Mon Sep 17 00:00:00 2001
From: mellor <mellor@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 7 Feb 2011 19:52:54 +0000
Subject: [PATCH] defect 3168885 - improve error msgs for xcatd connection
 failures

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8801 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 perl-xCAT/xCAT/Client.pm | 2 ++
 xCAT-server/sbin/xcatd   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/perl-xCAT/xCAT/Client.pm b/perl-xCAT/xCAT/Client.pm
index 5c527628e..dec5cac44 100644
--- a/perl-xCAT/xCAT/Client.pm
+++ b/perl-xCAT/xCAT/Client.pm
@@ -152,6 +152,8 @@ $request->{clienttype}->[0] = "cli";   # setup clienttype for auditlog
      );
    }
   unless ($client) {
+     print "Unable to open socket connection to xcatd daemon on $xcathost.\n";
+     print "Verify that the xcatd daemon is running and that your SSL setup is correct.\n";
      if ($@ =~ /SSL Timeout/) {
         die "Connection failure: SSL Timeout or incorrect certificates in ~/.xcat";
      } else {
diff --git a/xCAT-server/sbin/xcatd b/xCAT-server/sbin/xcatd
index d33ccd8b3..952b4a714 100755
--- a/xCAT-server/sbin/xcatd
+++ b/xCAT-server/sbin/xcatd
@@ -1296,7 +1296,7 @@ sub dispatch_request {
             #flock($dlock,LOCK_UN);
             if ($errstr) {
 	            if ($numdests == 1) {
-                    dispatch_callback({error=>["Unable to dispatch command to ".$ENV{XCATHOST}.", command will not make changes to that server ($errstr)"],errorcode=>[1]}); 
+                    dispatch_callback({error=>["Unable to dispatch hierarchical sub-command to ".$ENV{XCATHOST}.".  This service node may be down or its xcatd daemon may not be responding."],errorcode=>[1]}); 
 	                xCAT::MsgUtils->message("S","Error dispatching request to ".$ENV{XCATHOST}.": ".$errstr);
                 } else {
 	                xCAT::MsgUtils->message("S","Error dispatching request to ".$ENV{XCATHOST}.", trying other service nodes: ".$errstr);