Commit 0ac210d9 authored by ergonlogic's avatar ergonlogic

Issue #2494121: Stop servers in clusters from sync'ing back to master.

parent f8cc9bd4
...@@ -63,8 +63,7 @@ class Provision_Service_http_cluster extends Provision_Service_http { ...@@ -63,8 +63,7 @@ class Provision_Service_http_cluster extends Provision_Service_http {
} }
function fetch() { function fetch() {
$args = func_get_args(); drush_log('Skipping fetch from remote server(s), since master is authoritative in cluster service.');
$this->_each_server(__FUNCTION__, $args);
} }
function grant_server_list() { function grant_server_list() {
......
...@@ -108,8 +108,11 @@ function provision_drupal_push_site($override_slave_authority = FALSE) { ...@@ -108,8 +108,11 @@ function provision_drupal_push_site($override_slave_authority = FALSE) {
d()->service('http')->sync(d()->root, array('exclude-sites' => TRUE)); d()->service('http')->sync(d()->root, array('exclude-sites' => TRUE));
if (d()->type === 'site') { if (d()->type === 'site') {
// Check whether we're hosted on a cluster, in which case, the master is
// authoritative.
$cluster = d()->platform->web_server->http_service_type == 'cluster' ? TRUE : FALSE;
$options = array(); $options = array();
if ($override_slave_authority) { if ($override_slave_authority || $cluster) {
$exclude = NULL; $exclude = NULL;
} }
else { else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment