Change in ovirt-hosted-engine-ha[ovirt-hosted-engine-ha-1.3]: storage: validating NFS/gluster paths
by msivak＠redhat.com
Martin Sivák has submitted this change and it was merged.
Change subject: storage: validating NFS/gluster paths
......................................................................
storage: validating NFS/gluster paths
Validating NFS/gluster paths with os.path.normpath
as VDSM does.
Try to cleanly disconnect a previously connected
storage server if the storage server is already mounted
on a wrong path.
Asking the user to reboot if disconnectStorageServer fails
(it will clean the whole /var/run becouse is on tmpfs).
Change-Id: Ie7c8daa814dfdc3aaf3bae382e90b8d166839f40
Bug-Url: https://bugzilla.redhat.com/1300749
Signed-off-by: Simone Tiraboschi <stirabos(a)redhat.com>
---
M ovirt_hosted_engine_ha/agent/hosted_engine.py
M ovirt_hosted_engine_ha/env/path.py
M ovirt_hosted_engine_ha/lib/exceptions.py
M ovirt_hosted_engine_ha/lib/storage_server.py
M ovirt_hosted_engine_ha/lib/upgrade.py
5 files changed, 165 insertions(+), 24 deletions(-)
Approvals:
Sandro Bonazzola: Looks good to me, but someone else must approve
Martin Sivák: Looks good to me, approved
Simone Tiraboschi: Verified
Jenkins CI: Passed CI tests
--
To view, visit https://gerrit.ovirt.org/53842
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie7c8daa814dfdc3aaf3bae382e90b8d166839f40
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-hosted-engine-ha
Gerrit-Branch: ovirt-hosted-engine-ha-1.3
Gerrit-Owner: Simone Tiraboschi <stirabos(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com>
Gerrit-Reviewer: Simone Tiraboschi <stirabos(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 2 months
Change in ovirt-hosted-engine-ha[master]: storage: validating NFS/gluster paths
by msivak＠redhat.com
Martin Sivák has submitted this change and it was merged.
Change subject: storage: validating NFS/gluster paths
......................................................................
storage: validating NFS/gluster paths
Validating NFS/gluster paths with os.path.normpath
as VDSM does.
Try to cleanly disconnect a previously connected
storage server if the storage server is already mounted
on a wrong path.
Asking the user to reboot if disconnectStorageServer fails
(it will clean the whole /var/run becouse is on tmpfs).
Change-Id: Ie7c8daa814dfdc3aaf3bae382e90b8d166839f40
Bug-Url: https://bugzilla.redhat.com/1300749
Signed-off-by: Simone Tiraboschi <stirabos(a)redhat.com>
---
M ovirt_hosted_engine_ha/agent/hosted_engine.py
M ovirt_hosted_engine_ha/env/path.py
M ovirt_hosted_engine_ha/lib/exceptions.py
M ovirt_hosted_engine_ha/lib/storage_server.py
M ovirt_hosted_engine_ha/lib/upgrade.py
5 files changed, 165 insertions(+), 24 deletions(-)
Approvals:
Sandro Bonazzola: Looks good to me, but someone else must approve
Martin Sivák: Looks good to me, approved
Simone Tiraboschi: Verified
Jenkins CI: Passed CI tests
--
To view, visit https://gerrit.ovirt.org/53357
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie7c8daa814dfdc3aaf3bae382e90b8d166839f40
Gerrit-PatchSet: 18
Gerrit-Project: ovirt-hosted-engine-ha
Gerrit-Branch: master
Gerrit-Owner: Simone Tiraboschi <stirabos(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com>
Gerrit-Reviewer: Nir Soffer <nsoffer(a)redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com>
Gerrit-Reviewer: Simone Tiraboschi <stirabos(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 2 months
Change in ovirt-engine[ovirt-engine-3.6.3]: packaging: setup: check if self-hosted-engine on el6
by piotr.kliczewski＠gmail.com
Piotr Kliczewski has submitted this change and it was merged.
Change subject: packaging: setup: check if self-hosted-engine on el6
......................................................................
packaging: setup: check if self-hosted-engine on el6
If so, prompt, suggesting to abort setup.
Bug-Url: https://bugzilla.redhat.com/1311027
Change-Id: I7c3668bb15a984b691ea6ba10aad005af8ae0b74
Signed-off-by: Yedidyah Bar David <didi(a)redhat.com>
(cherry picked from commit 9f21c78abedb7106710e9296856f15978c06db0f)
---
M packaging/setup/ovirt_engine_setup/engine/constants.py
M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/__init__.py
A packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/hosted_engine.py
3 files changed, 168 insertions(+), 1 deletion(-)
Approvals:
Sandro Bonazzola: Looks good to me, approved
Jenkins CI: Passed CI tests
Yedidyah Bar David: Verified
--
To view, visit https://gerrit.ovirt.org/53878
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7c3668bb15a984b691ea6ba10aad005af8ae0b74
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.6.3
Gerrit-Owner: Yedidyah Bar David <didi(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: Yedidyah Bar David <didi(a)redhat.com>
8 years, 2 months
Change in ovirt-engine[master]: engine: Fix migration policy update for running VM
by rgolan＠redhat.com
Roy Golan has submitted this change and it was merged.
Change subject: engine: Fix migration policy update for running VM
......................................................................
engine: Fix migration policy update for running VM
Problem description:
--------------------
When a VM is running and its migration policy is changed to pinned - OR
A pinned VM is running and it dedicated hosts list is modified.
The VM may running on un-dedicated host, locking the VM away from its
dedicated host. Requiring VM reboot.
Desired behavior:
-----------------
1. When a VM is running and changing migration policy from un-pinned
to pinned.
- Validate the VM is running on one of the targeted pinned hosts,
- Fail with adequate warning.
- Proceed with normal update.
2. When pinned VM is running and changing the list of dedicated hosts.
And the dedicated hosts list excluding the pinned host.
- Validate the VM is running on one of the targeted pinned hosts,
- Fail with adequate warning.
- Proceed with normal update.
Implementation:
--------------
Add canDoAction constraint on modify a pinned VM, if it is running -
must run on its dedicated host. (UpdateVmCommand.java)
Change-Id: Ib3dc32a2b92ea0d111328eb6a6803fa91c015836
Bug-Url: https://bugzilla.redhat.com/1058384
Signed-off-by: Dudi Maroshi <dudi(a)redhat.com>
Signed-off-by: Andrej Krejcir <akrejcir(a)redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/VmValidator.java
M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateVmCommandTest.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/EngineMessage.java
M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties
7 files changed, 120 insertions(+), 2 deletions(-)
Approvals:
Jenkins CI: Passed CI tests
Roy Golan: Looks good to me, approved
Andrej Krejcir: Verified
--
To view, visit https://gerrit.ovirt.org/44289
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib3dc32a2b92ea0d111328eb6a6803fa91c015836
Gerrit-PatchSet: 28
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Dudi Maroshi
Gerrit-Reviewer: Andrej Krejcir <akrejcir(a)redhat.com>
Gerrit-Reviewer: Dudi Maroshi
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com>
Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com>
Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 2 months
Change in ovirt-engine[ovirt-engine-3.6]: packaging: setup: check if self-hosted-engine on el6
by piotr.kliczewski＠gmail.com
Piotr Kliczewski has submitted this change and it was merged.
Change subject: packaging: setup: check if self-hosted-engine on el6
......................................................................
packaging: setup: check if self-hosted-engine on el6
If so, prompt, suggesting to abort setup.
Bug-Url: https://bugzilla.redhat.com/1311027
Change-Id: I7c3668bb15a984b691ea6ba10aad005af8ae0b74
Signed-off-by: Yedidyah Bar David <didi(a)redhat.com>
---
M packaging/setup/ovirt_engine_setup/engine/constants.py
M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/__init__.py
A packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/hosted_engine.py
3 files changed, 168 insertions(+), 1 deletion(-)
Approvals:
Sandro Bonazzola: Looks good to me, approved
Simone Tiraboschi: Looks good to me, but someone else must approve
Jenkins CI: Passed CI tests
Yedidyah Bar David: Verified
--
To view, visit https://gerrit.ovirt.org/53876
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7c3668bb15a984b691ea6ba10aad005af8ae0b74
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.6
Gerrit-Owner: Yedidyah Bar David <didi(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com>
Gerrit-Reviewer: Simone Tiraboschi <stirabos(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: Yedidyah Bar David <didi(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 2 months
Change in ovirt-engine[ovirt-engine-3.6]: frontend: Change VM Time Zone display string to 'Hardware Cl...
by tnisan＠redhat.com
Tal Nisan has submitted this change and it was merged.
Change subject: frontend: Change VM Time Zone display string to 'Hardware Clock Time Offset'
......................................................................
frontend: Change VM Time Zone display string to 'Hardware Clock Time Offset'
Since there is quite a range of confusion what the value actually means
we should be more specific what this value is used for.
We do only use this value as a configuration value to offset the hardware
clock (RTC)
Change-Id: I35fed88a68638960e7722f2b085804fcd1b99a22
Bug-Url: https://bugzilla.redhat.com/1281871
Signed-off-by: Vinzenz Feenstra <vfeenstr(a)redhat.com>
---
M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java
2 files changed, 2 insertions(+), 5 deletions(-)
Approvals:
Jenkins CI: Passed CI tests
Martin Betak: Looks good to me, approved
Vinzenz Feenstra: Verified
--
To view, visit https://gerrit.ovirt.org/53791
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I35fed88a68638960e7722f2b085804fcd1b99a22
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.6
Gerrit-Owner: Vinzenz Feenstra <vfeenstr(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Betak <mbetak(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: Tomas Jelinek <tjelinek(a)redhat.com>
Gerrit-Reviewer: Vinzenz Feenstra <vfeenstr(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 2 months
Change in ovirt-hosted-engine-setup[ovirt-hosted-engine-setup-1.3]: cloud-init: disabling cloud-init services also on el6
by sbonazzo＠redhat.com
Sandro Bonazzola has submitted this change and it was merged.
Change subject: cloud-init: disabling cloud-init services also on el6
......................................................................
cloud-init: disabling cloud-init services also on el6
disabling cloud-init services to speed-up following boots
also for el6 appliances using chkconfig if systemctl fails
Change-Id: I013f27461df5df91a1c548b8a2548b697ebf3e13
Bug-Url: https://bugzilla.redhat.com/1299200
Signed-off-by: Simone Tiraboschi <stirabos(a)redhat.com>
(cherry picked from commit 864bc6d76c66fa72ad42633d115d57b23c251ca6)
---
M src/plugins/ovirt-hosted-engine-setup/vm/cloud_init.py
1 file changed, 7 insertions(+), 2 deletions(-)
Approvals:
Sandro Bonazzola: Looks good to me, approved
Simone Tiraboschi: Verified
Jenkins CI: Passed CI tests
--
To view, visit https://gerrit.ovirt.org/53874
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I013f27461df5df91a1c548b8a2548b697ebf3e13
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-hosted-engine-setup
Gerrit-Branch: ovirt-hosted-engine-setup-1.3
Gerrit-Owner: Simone Tiraboschi <stirabos(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com>
Gerrit-Reviewer: Simone Tiraboschi <stirabos(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 2 months
Change in ovirt-engine[ovirt-engine-3.6.3]: gluster: optionally stop gluster services
by piotr.kliczewski＠gmail.com
Piotr Kliczewski has submitted this change and it was merged.
Change subject: gluster: optionally stop gluster services
......................................................................
gluster: optionally stop gluster services
Introduce an option in the Host Maintenance
Pop-up to stop gluster services. If this option
is selected then all gluster services will be
stopped.
This patch will introduce a callback for host maintenance
and the callback will monitor the host status and it will
stop all gluster process when host is moved to maintenance.
Change-Id: I7f0455bdac3e8615755d80a552141c714ee65241
Bug-Url: https://bugzilla.redhat.com/1303539
Signed-off-by: Ramesh Nachimuthu <rnachimu(a)redhat.com>
---
A backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HostMaintenanceCallback.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MaintenanceNumberOfVdssCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MaintenanceVdsCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/MaintenanceNumberOfVdssParameters.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/MaintenanceVdsParameters.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/EngineMessage.java
M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/gluster/GlusterFeatureSupported.java
M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
M backend/manager/modules/restapi/interface/definition/src/main/resources/rsdl_metadata.yaml
M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostResource.java
M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/GlusterFeaturesUtil.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java
M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java
M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
17 files changed, 234 insertions(+), 35 deletions(-)
Approvals:
Piotr Kliczewski: Passed CI tests
Sahina Bose: Looks good to me, approved
Ramesh N: Verified
--
To view, visit https://gerrit.ovirt.org/53788
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7f0455bdac3e8615755d80a552141c714ee65241
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.6.3
Gerrit-Owner: Ramesh N <rnachimu(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com>
Gerrit-Reviewer: Ramesh N <rnachimu(a)redhat.com>
Gerrit-Reviewer: Sahina Bose <sabose(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 2 months
Change in ovirt-engine[ovirt-engine-3.6.3]: webadmin: Make multiselect behaviour of list model consistent
by oourfali＠redhat.com
Oved Ourfali has submitted this change and it was merged.
Change subject: webadmin: Make multiselect behaviour of list model consistent
......................................................................
webadmin: Make multiselect behaviour of list model consistent
Currently in the preferred host list it sometimes happens that when
listening on a multi select event and then accessing the single select
value of the list box, it still contains the old value. This patch makes
sure that the values for single and multi select are always synchronized.
Change-Id: I28feceb6a4c2d163e8edb2ea37b712bd82335a9c
Bug-Url: https://bugzilla.redhat.com/1265953
Bug-Url: https://bugzilla.redhat.com/1289967
Signed-off-by: Roman Mohr <rmohr(a)redhat.com>
---
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java
1 file changed, 9 insertions(+), 0 deletions(-)
Approvals:
Roman Mohr: Verified
Jenkins CI: Passed CI tests
Vojtech Szocs: Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/53786
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I28feceb6a4c2d163e8edb2ea37b712bd82335a9c
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.6.3
Gerrit-Owner: Roman Mohr <rmohr(a)redhat.com>
Gerrit-Reviewer: Alexander Wels <awels(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com>
Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com>
Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: Tomas Jelinek <tjelinek(a)redhat.com>
Gerrit-Reviewer: Vojtech Szocs <vszocs(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 2 months
Change in ovirt-engine[ovirt-engine-3.6]: webadmin: Make multiselect behaviour of list model consistent
by oourfali＠redhat.com
Oved Ourfali has submitted this change and it was merged.
Change subject: webadmin: Make multiselect behaviour of list model consistent
......................................................................
webadmin: Make multiselect behaviour of list model consistent
Currently in the preferred host list it sometimes happens that when
listening on a multi select event and then accessing the single select
value of the list box, it still contains the old value. This patch makes
sure that the values for single and multi select are always synchronized.
Change-Id: I28feceb6a4c2d163e8edb2ea37b712bd82335a9c
Bug-Url: https://bugzilla.redhat.com/1265953
Bug-Url: https://bugzilla.redhat.com/1289967
Signed-off-by: Roman Mohr <rmohr(a)redhat.com>
---
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java
1 file changed, 9 insertions(+), 0 deletions(-)
Approvals:
Roman Mohr: Verified
Jenkins CI: Passed CI tests
Vojtech Szocs: Looks good to me, approved
--
To view, visit https://gerrit.ovirt.org/53784
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I28feceb6a4c2d163e8edb2ea37b712bd82335a9c
Gerrit-PatchSet: 3
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.6
Gerrit-Owner: Roman Mohr <rmohr(a)redhat.com>
Gerrit-Reviewer: Alexander Wels <awels(a)redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Oved Ourfali <oourfali(a)redhat.com>
Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com>
Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com>
Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com>
Gerrit-Reviewer: Tomas Jelinek <tjelinek(a)redhat.com>
Gerrit-Reviewer: Vojtech Szocs <vszocs(a)redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org>
8 years, 2 months