From: Paulo Vital <pvital(a)linux.vnet.ibm.com&gt; With the new structure of Wok and Kimchi, the content of the objectstore file needs to be updated to reflect the new paths of icon and storagepool present in template's and VM's information. This patch adds a script to execute an update of these contents in the objectstore file during an upgrade from Kimchi 1.5.1 (or previous versions) to the new Wok and Kimchi 2.0 (or earlier) RPM's. Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com&gt; --- src/wok/plugins/kimchi/Makefile.am | 3 +- .../plugins/kimchi/contrib/update_objectstore.py | 64 ++++++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 src/wok/plugins/kimchi/contrib/update_objectstore.py diff --git a/src/wok/plugins/kimchi/Makefile.am b/src/wok/plugins/kimchi/Makefile.am index 8a55b23..cd49c10 100644 --- a/src/wok/plugins/kimchi/Makefile.am +++ b/src/wok/plugins/kimchi/Makefile.am @@ -49,10 +49,11 @@ EXTRA_DIST = \ VERSION \ build-aux/pkg-version \ config.py.in \ + contrib/update_objectstore.py \ $(NULL) -PEP8_BLACKLIST = *config.py,*i18n.py,*tests/test_config.py +PEP8_BLACKLIST = *config.py,*i18n.py,*tests/test_config.py,*update_object*.py I18N_FILES = ./i18n.py \ $(NULL) diff --git a/src/wok/plugins/kimchi/contrib/update_objectstore.py b/src/wok/plugins/kimchi/contrib/update_objectstore.py new file mode 100644 index 0000000..3d8ec3c --- /dev/null +++ b/src/wok/plugins/kimchi/contrib/update_objectstore.py @@ -0,0 +1,64 @@ +# Project Kimchi +# +# Copyright IBM, Corp. 2015 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +import json +import logging +import sqlite3 +import sys + +from wok.plugins.kimchi import config + + +logging.basicConfig(filename='/var/log/wok/kimchi-upgrade.log', + format='%(levelname)s:%(asctime)s: %(message)s', + datefmt='%Y-%m-%d %H:%M:%S %Z', + level=logging.DEBUG) + +def upgrade_paths(item, old_uri, new_uri): + total = 0 + try: + conn = sqlite3.connect(config.get_object_store(), timeout=10) + cursor = conn.cursor() + + sql = "SELECT id, json FROM objects WHERE type='template' OR type='vm';" + cursor.execute(sql) + for row in cursor.fetchall(): + # execute update here + template = json.loads(row[1]) + path = (template[item] if item in template else 'none') + if path.startswith(old_uri): + path = new_uri + path + template[item] = path + sql = "UPDATE objects SET json=? WHERE id=?" + cursor.execute(sql, (json.dumps(template),row[0])) + conn.commit() + total += 1 + except sqlite3.Error, e: + if conn: + conn.rollback() + logging.error("Error %s:", e.args[0]) + sys.exit(1) + finally: + if conn: + conn.close() + logging.info("%d '%s' entries upgraded.", total, item) + + +logging.info("Upgrading Kimchi objectstore to version 2.0.0 ...") +upgrade_paths('icon', 'images', 'plugins/kimchi/') +upgrade_paths('storagepool', '/storagepools', '/plugins/kimchi') -- 2.4.3

This patch set only covers the scenario when user is installing/upgrading Kimchi from a package. We also need to think about users whom installed Kimchi using make-install or even those running locally. So to cover all installation types, I suggest to make a solution outside SPEC files / build process. As I suggested before, we can add a tag "version" to the objectstore which reflects the Kimchi version. On server starts up, we verify the version and do the update if needed. That way we make sure the user will get the update objectstore independent on how he/she has installed it before. What do you think about it? Regards, Aline Manera On 26/10/2015 17:16, pvital(a)linux.vnet.ibm.com wrote:

From: Paulo Vital <pvital(a)linux.vnet.ibm.com&gt; Since the new main service process is wokd.service, during the upgrade from Kimchi 1.5.1 (or previous versions) to the new Wok and Kimchi 2.0 RPM's, the service kimchid must be stopped before the installation of the new service. Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com&gt; --- src/wok/plugins/kimchi/contrib/kimchi.spec.fedora.in | 3 +++ src/wok/plugins/kimchi/contrib/kimchi.spec.suse.in | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/wok/plugins/kimchi/contrib/kimchi.spec.fedora.in b/src/wok/plugins/kimchi/contrib/kimchi.spec.fedora.in index e987856..68ca4f6 100644 --- a/src/wok/plugins/kimchi/contrib/kimchi.spec.fedora.in +++ b/src/wok/plugins/kimchi/contrib/kimchi.spec.fedora.in @@ -72,6 +72,9 @@ if [ $1 -eq 2 ]; then mkdir -p %{_tmppath}/kimchi cp %{_sharedstatedir}/kimchi/objectstore %{_tmppath}/kimchi/ touch %{_tmppath}/kimchi/need_update + + # Stops kimchid.service process since the main service is wokd now + systemctl stop kimchid.service fi fi diff --git a/src/wok/plugins/kimchi/contrib/kimchi.spec.suse.in b/src/wok/plugins/kimchi/contrib/kimchi.spec.suse.in index 571cb1f..56d675b 100644 --- a/src/wok/plugins/kimchi/contrib/kimchi.spec.suse.in +++ b/src/wok/plugins/kimchi/contrib/kimchi.spec.suse.in @@ -60,6 +60,9 @@ if [ $1 -eq 2 ]; then mkdir -p %{_tmppath}/kimchi cp %{_var}/lib/kimchi/objectstore %{_tmppath}/kimchi/ touch %{_tmppath}/kimchi/need_update + + # Stops kimchid.service process since the main service is wokd now + systemctl stop kimchid.service fi fi -- 2.4.3