aboutsummaryrefslogtreecommitdiffstats
path: root/patches/fuel-library/upstream-backports/0002-Always-wait-for-MySQL-sync-on-service-refresh.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-10-01 13:18:11 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-10-09 16:33:43 +0200
commit42f8585ebb8fffad19a89314659ab9129176c3e9 (patch)
treee2cf6a4797bcbd036e080541cc3925f8b209549b /patches/fuel-library/upstream-backports/0002-Always-wait-for-MySQL-sync-on-service-refresh.patch
parent6f3a054fc95622f0c002f72c0fac6074bb36c36f (diff)
build: Rework patch mechanism for Fuel submodules
While refactoring the patching mechanism, take care of: - Sync submodule handling with Fuel@OPFNV; - build: Investigate/prepare for moving patches to Fuel@OPNFV; - build: Investigate divergent fuel-mirror; - ISO build: cacheid for Fuel comps should not depend on Armband git commit; CHANGE: Rename/shuffle patches while grouping them in "features", preparing for upstreaming them to Fuel@OPNFV and beyond. CHANGE: Allow linking patches for better representing the dependency between one patch and different features. e.g. 0001-Add-arch-to-nailgun-release-and-target-image.patch: - part of `multiarch-fuel`, because it extends Fuel; - part of `direct-kernel-boot`, as arch is required for that; - part of `cross-bootstrap`, target image is arch-dependent; NOTE: Patch links are not staged to Fuel@OPNFV, they only serve as markers that a specific patch is part of a feature. CHANGE: Kill all Fuel component submodules, now handled in Fuel@OPNFV: - fuel-agent - fuel-astute - fuel-library - fuel-mirror - fuel-nailgun-agent - fuel-web CHANGE: Move armband-fuel-config.mk to armband git root. FIXME: m1.micro-Increase-profile-RAM-size-to-128MB.patch is NOT part of `cross-bootstrap` feature, but patch context says so ... FIXME: 0001-Add-arm64-deb-repositories-setup.patch is broken at `make patches-export` by removing spaces at EOL. v2 -> v3: * Phony patch support (links to show a patch belongs to a feature); * Updated README.md v3 -> v7: * Re-export Fuel submodules & plugins patches (update patch context); * Update Cavium mail addresses (s/caviumnetworks.com/cavium.com/); * Ignore submodule changes; * Add armband git repo info to gitinfo_fuel.txt at build time; Implements: ARMBAND-136 Closes-bug: ARMBAND-95 Closes-bug: ARMBAND-93 Closes-bug: ARMBAND-92 Change-Id: I1a236d9f43b2e6dca22055911f696b43c22b5973 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/fuel-library/upstream-backports/0002-Always-wait-for-MySQL-sync-on-service-refresh.patch')
-rw-r--r--patches/fuel-library/upstream-backports/0002-Always-wait-for-MySQL-sync-on-service-refresh.patch60
1 files changed, 60 insertions, 0 deletions
diff --git a/patches/fuel-library/upstream-backports/0002-Always-wait-for-MySQL-sync-on-service-refresh.patch b/patches/fuel-library/upstream-backports/0002-Always-wait-for-MySQL-sync-on-service-refresh.patch
new file mode 100644
index 00000000..d7fac948
--- /dev/null
+++ b/patches/fuel-library/upstream-backports/0002-Always-wait-for-MySQL-sync-on-service-refresh.patch
@@ -0,0 +1,60 @@
+From: dmburmistrov <dmburmistrov@mirantis.com>
+Date: Thu, 18 Aug 2016 21:30:26 +0300
+Subject: [PATCH] Always wait for MySQL sync on service refresh
+
+Always trigger Exec['wait-for-sync'] on
+MySQL service refresh.
+
+Closes-bug: #1614647
+
+Change-Id: I82ec0d46eff217daedc1bd07c67069498c515c44
+---
+ deployment/puppet/cluster/manifests/mysql.pp | 6 +++---
+ deployment/puppet/cluster/spec/classes/cluster_mysql_spec.rb | 6 +++++-
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/deployment/puppet/cluster/manifests/mysql.pp b/deployment/puppet/cluster/manifests/mysql.pp
+index c36b65d..f483cf6 100644
+--- a/deployment/puppet/cluster/manifests/mysql.pp
++++ b/deployment/puppet/cluster/manifests/mysql.pp
+@@ -104,7 +104,7 @@ class cluster::mysql (
+ require => Package['mysql-server'],
+ } ~>
+
+- exec { 'wait-initial-sync':
++ exec { 'wait-for-sync':
+ path => '/bin:/sbin:/usr/bin:/usr/sbin',
+ command => "mysql ${user_password_string} -Nbe \"show status like 'wsrep_local_state_comment'\" | grep -q -e Synced && sleep 10",
+ try_sleep => 10,
+@@ -119,7 +119,7 @@ class cluster::mysql (
+ }
+
+ Exec['create-init-file'] ->
+- Service<| title == $service_name |> ->
+- Exec['wait-initial-sync'] ->
++ Service<| title == $service_name |> ~>
++ Exec['wait-for-sync'] ->
+ Exec['rm-init-file']
+ }
+diff --git a/deployment/puppet/cluster/spec/classes/cluster_mysql_spec.rb b/deployment/puppet/cluster/spec/classes/cluster_mysql_spec.rb
+index cf2c719..72c8c2f 100644
+--- a/deployment/puppet/cluster/spec/classes/cluster_mysql_spec.rb
++++ b/deployment/puppet/cluster/spec/classes/cluster_mysql_spec.rb
+@@ -34,12 +34,16 @@ describe 'cluster::mysql' do
+ /'username'@'localhost' IDENTIFIED BY 'password'/
+ )
+ should contain_exec('create-init-file').that_comes_before('Service[mysqld]')
+- should contain_exec('create-init-file').that_notifies('Exec[wait-initial-sync]')
++ should contain_exec('create-init-file').that_notifies('Exec[wait-for-sync]')
+ end
+
+ it 'creates exec to remove init-file' do
+ should contain_exec('rm-init-file')
+ end
++
++ it 'creates exec to wait initial database sync' do
++ should contain_exec('wait-for-sync').that_subscribes_to('Service[mysqld]')
++ end
+ end
+
+ end