Merge lp:~marcustomlinson/keeper/link-against-real-storage-framework into lp:keeper/devel

[Marcus Tomlinson]

The branch links keeper-service against the non-local version of storage-framework

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:103
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-ci/5/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/403/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/409/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-ci/5/rebuild

review: Needs Fixing (continuous-integration)

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:103
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-ci/8/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/406
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/412
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=vivid+overlay/320
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=xenial+overlay/320
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=yakkety/320
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/250
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/250/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/250
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/250/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/250
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/250/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/250
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/250/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/250
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/250/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/250
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/250/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/250
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/250/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/250
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/250/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/250
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/250/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-ci/8/rebuild

review: Approve (continuous-integration)

[lp:~marcustomlinson/keeper/link-against-real-storage-framework]

104. By Marcus Tomlinson on 2016-08-24

colon is not allowed in filename for mcloud

105. By Marcus Tomlinson on 2016-08-24

try..catch over uploader_closed_watcher_ and uploader_ready_watcher_ result() calls

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:104
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-ci/27/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/463/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/469
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=vivid+overlay/374
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=xenial+overlay/374
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=yakkety/374
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/304
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/304/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/304/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/304
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/304/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/304
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/304/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/304
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/304/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/304
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/304/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/304
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/304/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/304
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/304/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/304/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-ci/27/rebuild

review: Needs Fixing (continuous-integration)

[lp:~marcustomlinson/keeper/link-against-real-storage-framework]

106. By Marcus Tomlinson on 2016-08-24

Merged devel

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:106
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-ci/28/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/464/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/470
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=vivid+overlay/375
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=xenial+overlay/375
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=yakkety/375
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/305
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/305/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/305
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/305/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/305
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/305/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/305
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/305/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/305
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/305/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/305
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/305/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/305
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/305/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/305
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/305/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/305/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-ci/28/rebuild

review: Needs Fixing (continuous-integration)

[Charles Kerr (charlesk)]

review: Approve

=== modified file 'src/storage-framework/storage_framework_client.cpp'
--- src/storage-framework/storage_framework_client.cpp	2016-08-19 16:09:44 +0000
+++ src/storage-framework/storage_framework_client.cpp	2016-08-24 07:04:48 +0000
@@ -32,35 +32,15 @@
     , uploader_()
 {
     QObject::connect(&uploader_ready_watcher_,&QFutureWatcher<std::shared_ptr<Uploader>>::finished, this, &StorageFrameworkClient::uploaderReady);
-    QObject::connect(&uploader_closed_watcher_,&QFutureWatcher<std::shared_ptr<unity::storage::qt::client::File>>::finished, this, &StorageFrameworkClient::onUploaderClosed);
+    QObject::connect(&uploader_closed_watcher_,&QFutureWatcher<std::shared_ptr<File>>::finished, this, &StorageFrameworkClient::onUploaderClosed);
+    QObject::connect(&accounts_watcher_,&QFutureWatcher<QVector<std::shared_ptr<Account>>>::finished, this, &StorageFrameworkClient::accountsReady);
+    QObject::connect(&roots_watcher_,&QFutureWatcher<QVector<std::shared_ptr<Root>>>::finished, this, &StorageFrameworkClient::rootsReady);
 }
 
-
 void StorageFrameworkClient::getNewFileForBackup(quint64 n_bytes)
 {
-    // Get the acccounts. (There is only one account for the local client implementation.)
-    // We do this synchronously for simplicity.
-    try {
-        auto accounts = runtime_->accounts().result();
-        Root::SPtr root = accounts[0]->roots().result()[0];
-        qDebug() << "id:" << root->native_identity();
-        qDebug() << "time:" << root->last_modified_time();
-
-
-        // XGM ADD A new file to the root
-        QFutureWatcher<std::shared_ptr<Uploader>> new_file_watcher;
-
-        // get the current date and time to create the new file
-        QDateTime now = QDateTime::currentDateTime();
-        QString new_file_name = QString("Backup_%1").arg(now.toString("dd.MM.yyyy-hh:mm:ss.zzz"));
-
-        uploader_ready_watcher_.setFuture(root->create_file(new_file_name, n_bytes));
-    }
-    catch (std::exception & e)
-    {
-        qDebug() << "ERROR: StorageFrameworkClient::getNewFileForBackup():" << e.what();
-        throw;
-    }
+    accounts_watcher_.setProperty("n_bytes", n_bytes);
+    accounts_watcher_.setFuture(runtime_->accounts());
 }
 
 void StorageFrameworkClient::finish(bool do_commit)
@@ -85,16 +65,75 @@
 
 void StorageFrameworkClient::onUploaderClosed()
 {
-    auto file = uploader_closed_watcher_.result();
-    qDebug() << "Uploader for file" << file->name() << "was closed";
+    try
+    {
+        auto file = uploader_closed_watcher_.result();
+        qDebug() << "Uploader for file" << file->name() << "was closed";
+    }
+    catch (std::exception const& e)
+    {
+        qDebug() << "ERROR: StorageFrameworkClient::onUploaderClosed():" << e.what();
+    }
+
     uploader_->socket()->disconnectFromServer();
     uploader_.reset();
     Q_EMIT(finished());
 }
 
+void StorageFrameworkClient::accountsReady()
+{
+    // Get the acccounts. (There is only one account for the client implementation.)
+    try {
+        auto accounts = accounts_watcher_.result();
+
+        if (accounts.empty())
+        {
+            throw std::runtime_error("No accounts returned from Storage Framework");
+        }
+
+        roots_watcher_.setFuture(accounts[0]->roots());
+    }
+    catch (std::exception & e)
+    {
+        qDebug() << "ERROR: StorageFrameworkClient::accountsReady():" << e.what();
+        throw;
+    }
+}
+
+void StorageFrameworkClient::rootsReady()
+{
+    try {
+        Root::SPtr root = roots_watcher_.result()[0];
+
+        qDebug() << "id:" << root->native_identity();
+        qDebug() << "time:" << root->last_modified_time();
+
+        // XGM ADD A new file to the root
+        QFutureWatcher<std::shared_ptr<Uploader>> new_file_watcher;
+
+        // get the current date and time to create the new file
+        QDateTime now = QDateTime::currentDateTime();
+        QString new_file_name = QString("Backup_%1").arg(now.toString("dd.MM.yyyy-hh.mm.ss.zzz"));
+
+        uploader_ready_watcher_.setFuture(root->create_file(new_file_name, accounts_watcher_.property("n_bytes").toUInt()));
+    }
+    catch (std::exception & e)
+    {
+        qDebug() << "ERROR: StorageFrameworkClient::rootsReady():" << e.what();
+        throw;
+    }
+}
+
 void StorageFrameworkClient::uploaderReady()
 {
-    uploader_ = uploader_ready_watcher_.result();
+    try
+    {
+        uploader_ = uploader_ready_watcher_.result();
+    }
+    catch (std::exception const& e)
+    {
+        qDebug() << "ERROR: StorageFrameworkClient::uploaderReady():" << e.what();
+    }
 
     Q_EMIT (socketReady(uploader_->socket()));
 }

=== modified file 'src/storage-framework/storage_framework_client.h'
--- src/storage-framework/storage_framework_client.h	2016-08-18 02:06:58 +0000
+++ src/storage-framework/storage_framework_client.h	2016-08-24 07:04:48 +0000
@@ -45,6 +45,8 @@
 private Q_SLOTS:
     void uploaderReady();
     void onUploaderClosed();
+    void accountsReady();
+    void rootsReady();
 
 private:
     unity::storage::qt::client::Runtime::SPtr runtime_;
@@ -52,5 +54,7 @@
     // watchers
     QFutureWatcher<std::shared_ptr<unity::storage::qt::client::Uploader>> uploader_ready_watcher_;
     QFutureWatcher<std::shared_ptr<unity::storage::qt::client::File>> uploader_closed_watcher_;
+    QFutureWatcher<QVector<std::shared_ptr<unity::storage::qt::client::Account>>> accounts_watcher_;
+    QFutureWatcher<QVector<std::shared_ptr<unity::storage::qt::client::Root>>> roots_watcher_;
     std::shared_ptr<unity::storage::qt::client::Uploader> uploader_;
 };