Merge ../1.1

ClusterLabs · May 12, 2015 · 8ae4530 · 8ae4530
2 parents a78b289 + 05e7ef6
commit 8ae4530
Show file tree

Hide file tree

Showing 37 changed files with 2,543 additions and 536 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -35,7 +35,7 @@ before_install:
 install:
  - sudo apt-get install -qq automake autoconf chrpath libglib2.0-dev perl net-tools python libtool libxml2-dev bison flex uuid-dev libbz2-dev zlib1g-dev libltdl3-dev libgnutls-dev python-central python-dev libpam0g-dev libncurses5-dev libcorosync-dev libxslt1-dev libdbus-1-dev
  - sudo apt-get install -qq cluster-glue-dev heartbeat-dev libheartbeat2-dev 
- - sudo apt-get install -qq libqb-dev/saucy
+ - sudo apt-get install -qq libqb-dev
 
 before_script:
 # Save and restore CC so that ./configure can pass

diff --git a/GNUmakefile b/GNUmakefile
@@ -140,21 +140,26 @@ $(PACKAGE)-%.spec: $(PACKAGE).spec.in
 	    echo "Rebuilt $@ from $(TAG)";					\
 	fi
 
+# rpmbuild apparently temporarily lost the ability to use --with arguments at some point
+# Compensate by tweaking the format for pcmk_release here
 srpm-%:	export $(PACKAGE)-%.spec
 	rm -f *.src.rpm
 	cp $(PACKAGE)-$*.spec $(PACKAGE).spec
+	echo "* $(shell date +"%a %b %d %Y") Andrew Beekhof <andrew@beekhof.net> $(shell git describe --tags $(TAG) | sed -e s:Pacemaker-:: -e s:-.*::)-1" >> $(PACKAGE).spec
+	echo " - See included ChangeLog file or https://raw.github.com/ClusterLabs/pacemaker/master/ChangeLog for full details" >> $(PACKAGE).spec
 	if [ -e $(BUILD_COUNTER) ]; then					\
 		echo $(COUNT) > $(BUILD_COUNTER);				\
 	fi
 	sed -i 's/global\ specversion.*/global\ specversion\ $(SPECVERSION)/' $(PACKAGE).spec
 	sed -i 's/global\ commit.*/global\ commit\ $(TAG)/' $(PACKAGE).spec
 	case "$(WITH)" in 	\
 	  *pre_release*)	\
-	    sed -i 's/Version:.*/Version:\ $(shell echo $(NEXT_RELEASE) | sed -e s:Pacemaker-:: -e s:-.*::)/' $(PACKAGE).spec;;\
+	    sed -i 's/global\ pcmk_release.*/global\ pcmk_release\ 0.%{specversion}.%{shortcommit}.git/' $(PACKAGE).spec;	\
+	    sed -i 's/Version:.*/Version:\ $(shell echo $(NEXT_RELEASE) | sed -e s:Pacemaker-:: -e s:-.*::)/' $(PACKAGE).spec;;	\
 	  *)			\
 	    sed -i 's/Version:.*/Version:\ $(shell git describe --tags $(TAG) | sed -e s:Pacemaker-:: -e s:-.*::)/' $(PACKAGE).spec;;\
 	esac
-	rpmbuild -bs --define "dist .$*" $(RPM_OPTS) $(WITH)  $(PACKAGE).spec
+	rpmbuild -bs --define "dist .$*" $(RPM_OPTS) $(PACKAGE).spec
 
 chroot: mock-$(MOCK_CFG) mock-install-$(MOCK_CFG) mock-sh-$(MOCK_CFG)
 	echo "Done"

diff --git a/Makefile.am b/Makefile.am
@@ -55,10 +55,8 @@ core-clean:
 install-exec-local:
 	$(INSTALL) -d $(DESTDIR)/$(LCRSODIR)
 	$(INSTALL) -d -m 750 $(DESTDIR)/$(CRM_CONFIG_DIR)
-	$(INSTALL) -d -m 750 $(DESTDIR)/$(CRM_STATE_DIR)
 	$(INSTALL) -d -m 750 $(DESTDIR)/$(CRM_BLACKBOX_DIR)
 	-chown $(CRM_DAEMON_USER):$(CRM_DAEMON_GROUP) $(DESTDIR)/$(CRM_CONFIG_DIR)
-	-chown $(CRM_DAEMON_USER):$(CRM_DAEMON_GROUP) $(DESTDIR)/$(CRM_STATE_DIR)
 	-chown $(CRM_DAEMON_USER):$(CRM_DAEMON_GROUP) $(DESTDIR)/$(CRM_BLACKBOX_DIR)
 if BUILD_CS_PLUGIN
 	rm -f $(DESTDIR)$(LCRSODIR)/pacemaker.lcrso $(DESTDIR)$(LCRSODIR)/service_crm.so

diff --git a/crmd/te_events.c b/crmd/te_events.c
@@ -589,10 +589,8 @@ process_graph_event(xmlNode * event, const char *event_node)
             abort_transition(INFINITY, tg_restart, "Unknown event", event);
 
         } else {
-            /* XML_ATTR_TE_ALLOWFAIL will be true if on-fail=ignore for the operation */
-            ignore_failures = crm_is_true(crm_meta_value(action->params,
-                                                         XML_ATTR_TE_ALLOWFAIL));
-
+            ignore_failures = safe_str_eq(
+                crm_meta_value(action->params, XML_OP_ATTR_ON_FAIL), "ignore");
             match_graph_event(action, event, status, rc, target_rc, ignore_failures);
         }
     }

diff --git a/include/crm/msg_xml.h b/include/crm/msg_xml.h
@@ -342,7 +342,6 @@
 
 #  define XML_ATTR_TE_NOWAIT		"op_no_wait"
 #  define XML_ATTR_TE_TARGET_RC		"op_target_rc"
-#  define XML_ATTR_TE_ALLOWFAIL		"op_allow_fail"
 #  define XML_ATTR_LRM_PROBE		"lrm-is-probe"
 #  define XML_TAG_TRANSIENT_NODEATTRS	"transient_attributes"
 
@@ -393,6 +392,9 @@
 #  define XML_DIFF_PATH                 "path"
 #  define XML_DIFF_POSITION             "position"
 
+/* Defined for backward API compatibility but no longer used by Pacemaker */
+#  define XML_ATTR_TE_ALLOWFAIL         "op_allow_fail"
+
 #  include <crm/common/xml.h>
 
 #  define ID(x) crm_element_value(x, XML_ATTR_ID)

diff --git a/include/crm/pengine/status.h b/include/crm/pengine/status.h
@@ -218,7 +218,7 @@ enum pe_action_flags {
     pe_action_print_always = 0x00008,
 
     pe_action_have_node_attrs = 0x00010,
-    pe_action_failure_is_fatal = 0x00020,
+    pe_action_failure_is_fatal = 0x00020, /* no longer used, here for API compatibility */
     pe_action_implied_by_stonith = 0x00040,
     pe_action_migrate_runnable =   0x00080,
 

diff --git a/lib/pengine/utils.c b/lib/pengine/utils.c
@@ -416,7 +416,6 @@ custom_action(resource_t * rsc, char *key, const char *task,
         }
         action->uuid = strdup(key);
 
-        pe_set_action_bit(action, pe_action_failure_is_fatal);
         pe_set_action_bit(action, pe_action_runnable);
         if (optional) {
             pe_rsc_trace(rsc, "Set optional on %s", action->uuid);
@@ -770,7 +769,6 @@ unpack_operation(action_t * action, xmlNode * xml_obj, resource_t * container,
     } else if (safe_str_eq(value, "ignore")
                || safe_str_eq(value, "nothing")) {
         action->on_fail = action_fail_ignore;
-        pe_clear_action_bit(action, pe_action_failure_is_fatal);
         value = "ignore";
 
     } else if (safe_str_eq(value, "migrate")) {