Bug 738567

Description of problem:

ccs --checkconf works fine when -h hostname is set, however it should be able to validate the node synchronisation if only -f filename is given (as noted in man pages). The result of a -f check however is always false regardless the real cluster sync status.

I believe this is due to the method comparing config file xml to the live config from ricci, where the file xml has the intendation set as is in the file itself, but the live xml from ricci has no intendation at all, therefore bare comparation of such string will always fail.

Here's how it looks when i changed the ccs python code to dump the xml:

<cluster config_version="56" name="mycluster">
	<fence_daemon/>
	<clusternodes>
		<clusternode name="z2" nodeid="1"/>
		<clusternode name="z4" nodeid="2"/>
	</clusternodes>
	<cman/>
	<fencedevices/>
	<rm>
		<failoverdomains/>
		<resources/>
	</rm>
</cluster>

<cluster config_version="56" name="mycluster">
<fence_daemon/>
<clusternodes>
<clusternode name="z2" nodeid="1"/>
<clusternode name="z4" nodeid="2"/>
</clusternodes>
<cman/>
<fencedevices/>
<rm>
<failoverdomains/>
<resources/>
</rm>
</cluster>

The first one is a xml variable and the second one is the xml2 variable from check_cluster_conf() function.



[root@z2 cluster]# ccs -h z2 --checkconf
All nodes in sync.
[root@z2 cluster]# ccs -f /etc/cluster/cluster.conf --checkconf
Node: z2 does not match
Node: z4 does not match


Version-Release number of selected component (if applicable):
ccs-0.16.2-41.el6


How reproducible:
Always


Steps to Reproduce:

1. create a multi-node cluster (two nodes is enough)
2. sync the configuration (ccs -h z2 --sync --activate)
3. run a checkconf against config file on any of the nodes (ccs -f /etc/cluster/cluster.conf --checkconf)

  
Actual results:

[root@z2 cluster]# ccs -h z2 --checkconf
All nodes in sync.
[root@z2 cluster]# ccs -f /etc/cluster/cluster.conf --checkconf
Node: z2 does not match
Node: z4 does not match


Expected results:

[root@z2 cluster]# ccs -h z2 --checkconf
All nodes in sync.
[root@z2 cluster]# ccs -f /etc/cluster/cluster.conf --checkconf
All nodes in sync.


Additional info:

[root@z2 sbin]# cat /etc/cluster/cluster.conf 
<?xml version="1.0"?>
<cluster config_version="51" name="mycluster">
	<fence_daemon/>
	<clusternodes>
		<clusternode name="z2" nodeid="1"/>
		<clusternode name="z4" nodeid="2"/>
	</clusternodes>
	<cman/>
	<fencedevices/>
	<rm>
		<failoverdomains/>
		<resources/>
	</rm>
</cluster>