Commit 64fd4707 authored by Olya Kalitova's avatar Olya Kalitova Committed by Commit Bot

Log failure details in case container configuration failed

Adds failure details in case default Crostini configuration using
Ansible has failed.

TEST: deployed on DUT and checked that logs are present
Bug: 1000287
Change-Id: I4215bb117ed82fe8829ea5375767000645326915
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1991561Reviewed-by: default avatarNic Hollingum <hollingum@google.com>
Commit-Queue: Olya Kalitova <okalitova@chromium.org>
Cr-Commit-Position: refs/heads/master@{#730136}
parent f9f51f7a
......@@ -179,13 +179,15 @@ void AnsibleManagementService::OnApplyAnsiblePlaybook(
}
void AnsibleManagementService::OnApplyAnsiblePlaybookProgress(
vm_tools::cicerone::ApplyAnsiblePlaybookProgressSignal::Status status) {
vm_tools::cicerone::ApplyAnsiblePlaybookProgressSignal::Status status,
const std::string& failure_details) {
switch (status) {
case vm_tools::cicerone::ApplyAnsiblePlaybookProgressSignal::SUCCEEDED:
OnConfigurationFinished(true);
break;
case vm_tools::cicerone::ApplyAnsiblePlaybookProgressSignal::FAILED:
LOG(ERROR) << "Ansible playbook application has failed";
LOG(ERROR) << "Ansible playbook application has failed with reason:\n"
<< failure_details;
OnConfigurationFinished(false);
break;
case vm_tools::cicerone::ApplyAnsiblePlaybookProgressSignal::IN_PROGRESS:
......
......@@ -52,7 +52,8 @@ class AnsibleManagementService : public KeyedService,
int progress_percent) override;
void OnApplyAnsiblePlaybookProgress(
vm_tools::cicerone::ApplyAnsiblePlaybookProgressSignal::Status status);
vm_tools::cicerone::ApplyAnsiblePlaybookProgressSignal::Status status,
const std::string& failure_details);
void AddObserver(Observer* observer);
void RemoveObserver(Observer* observer);
......
......@@ -2322,7 +2322,8 @@ void CrostiniManager::OnApplyAnsiblePlaybookProgress(
// TODO(okalitova): Add an observer.
AnsibleManagementService::GetForProfile(profile_)
->OnApplyAnsiblePlaybookProgress(signal.status());
->OnApplyAnsiblePlaybookProgress(signal.status(),
signal.failure_details());
}
void CrostiniManager::OnUpgradeContainerProgress(
......
......@@ -218,7 +218,8 @@ IN_PROC_BROWSER_TEST_F(CrostiniAnsibleSoftwareConfigViewBrowserTest,
EXPECT_NE(nullptr, ActiveView());
ansible_management_service()->OnApplyAnsiblePlaybookProgress(
vm_tools::cicerone::ApplyAnsiblePlaybookProgressSignal::SUCCEEDED);
vm_tools::cicerone::ApplyAnsiblePlaybookProgressSignal::SUCCEEDED,
/*failure_details=*/"");
base::RunLoop().RunUntilIdle();
EXPECT_TRUE(HasNoView());
......@@ -257,7 +258,8 @@ IN_PROC_BROWSER_TEST_F(CrostiniAnsibleSoftwareConfigViewBrowserTest,
EXPECT_NE(nullptr, ActiveView());
ansible_management_service()->OnApplyAnsiblePlaybookProgress(
vm_tools::cicerone::ApplyAnsiblePlaybookProgressSignal::FAILED);
vm_tools::cicerone::ApplyAnsiblePlaybookProgressSignal::FAILED,
/*failure_details=*/"");
base::RunLoop().RunUntilIdle();
EXPECT_NE(nullptr, ActiveView());
......
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