From c64a25a52879365229c2b656827279b8870c072c Mon Sep 17 00:00:00 2001 From: Victor Hu Date: Sat, 16 Dec 2017 22:36:10 -0500 Subject: [PATCH 01/21] Add section for OpenBMC rflash in admin-guide, link this section to CORAL reference section --- .../ppc64le/management/advanced/index.rst | 2 +- .../management/advanced/rflash/index.rst | 10 ++++ .../advanced/{rflash.rst => rflash/ipmi.rst} | 6 +- .../advanced/rflash/openbmc/index.rst | 8 +++ .../advanced/rflash/openbmc/manually.rst | 10 ++++ .../rflash/openbmc/openbmc_common.rst} | 57 ++++++++++++------- .../advanced/rflash/openbmc/unattended.rst | 10 ++++ .../coral/cluster_mgmt/firmware/index.rst | 2 +- .../cluster_mgmt/firmware/openbmc/index.rst | 8 +++ .../firmware/openbmc/manually.rst | 10 ++++ .../firmware/openbmc/unattended.rst | 10 ++++ 11 files changed, 105 insertions(+), 28 deletions(-) create mode 100644 docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/index.rst rename docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/{rflash.rst => rflash/ipmi.rst} (69%) create mode 100644 docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/index.rst create mode 100644 docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/manually.rst rename docs/source/{references/coral/cluster_mgmt/firmware/openbmc.rst => guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst} (68%) create mode 100644 docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/unattended.rst create mode 100644 docs/source/references/coral/cluster_mgmt/firmware/openbmc/index.rst create mode 100644 docs/source/references/coral/cluster_mgmt/firmware/openbmc/manually.rst create mode 100644 docs/source/references/coral/cluster_mgmt/firmware/openbmc/unattended.rst diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/index.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/index.rst index fd165f112..6070b8be6 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/index.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/index.rst @@ -6,5 +6,5 @@ Advanced Operations rinv.rst rvitals.rst - rflash.rst + rflash/index.rst rspconfig.rst diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/index.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/index.rst new file mode 100644 index 000000000..dce79f855 --- /dev/null +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/index.rst @@ -0,0 +1,10 @@ +``rflash`` - Remote Firmware Flashing +===================================== + +See :doc:`rflash manpage ` for more information. + +.. toctree:: + :maxdepth: 2 + + ipmi.rst + openbmc/index.rst diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/ipmi.rst similarity index 69% rename from docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash.rst rename to docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/ipmi.rst index 4bb1d2d07..0e0234ac6 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/ipmi.rst @@ -1,7 +1,5 @@ -``rflash`` - Remote Firmware Flashing -===================================== - -See :doc:`rflash manpage ` for more information. +IPMI Firmware Update +==================== The ``rflash`` command is provided to assist the system administrator in updating firmware. diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/index.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/index.rst new file mode 100644 index 000000000..4f841ef1a --- /dev/null +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/index.rst @@ -0,0 +1,8 @@ +OpenBMC Firmware Update +======================= + +.. toctree:: + :maxdepth: 2 + + unattended.rst + manually.rst diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/manually.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/manually.rst new file mode 100644 index 000000000..2806230e2 --- /dev/null +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/manually.rst @@ -0,0 +1,10 @@ +Manual Firmware Flash +===================== + +.. include:: ./openbmc_common.rst + :start-after: BEGIN_flashing_OpenBMC_Servers + :end-before: END_flashing_OpenBMC_Servers + +.. include:: ./openbmc_common.rst + :start-after: BEGIN_Validation_OpenBMC_firmware + :end-before: END_Validation_OpenBMC_firmware diff --git a/docs/source/references/coral/cluster_mgmt/firmware/openbmc.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst similarity index 68% rename from docs/source/references/coral/cluster_mgmt/firmware/openbmc.rst rename to docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst index 49caae6bf..980fc8d83 100644 --- a/docs/source/references/coral/cluster_mgmt/firmware/openbmc.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst @@ -1,18 +1,27 @@ -OpenBMC Firmware Update -======================= +.. BEGIN_unattended_OpenBMC_flashing -The process of updating firmware on the OpenBMC managed servers is documented below. +Unattended flash of OpenBMC managed BMC means that xCAT will attempt to: -The sequence of events that must happen is the following: +#. Upload and active BMC, PNOR or both depending on which files are provided. +#. Reboot the necessary components (BMC and/or HOST) to activate the firmware levels - * Power off the Host - * Update and Activate PNOR - * Update and Activate BMC - * Reboot the BMC (applies BMC) - * Power on the Host (applies PNOR) +Use the following command to flash the firmware unattended: :: -**Note:** xCAT is working on streamlining this process to reduce the flexibility of the above steps at the convenience of the Administrator to handle the necessary reboots. See `Issue #4245 `_ + rpower -d /path/to/directory +If there are errors encountered during the flash process, take a look at the manual steps to continue flashing the BMC. + +.. END_unattended_OpenBMC_flashing + +.. BEGIN_flashing_OpenBMC_Servers + +The sequence of events that must happen to flash OpenBMC firmware is the following: + +#. Power off the Host +#. Upload and Activate BMC +#. Reboot the BMC (applies BMC) +#. Upload and Activate PNOR +#. Power on the Host (applies PNOR) Power off Host @@ -22,18 +31,7 @@ Use the rpower command to power off the host: :: rpower off -Update and Activate PNOR Firmware ---------------------------------- - -Use the rflash command to upload and activate the PNOR firmware: :: - - rflash -a /path/to/witherspoon.pnor.squashfs.tar - -If running ``rflash`` in Hierarchy, the firmware files must be accessible on the Service Nodes. - -**Note:** The ``-a`` option does an upload and activate in one step, after firmware is activated, use the ``rflash -l`` to view. The ``rflash`` command shows ``(*)`` as the active firmware and ``(+)`` on the firmware that requires reboot to become effective. - -Update and Activate BMC Firmware +Upload and Activate BMC Firmware -------------------------------- Use the rflash command to upload and activate the PNOR firmware: :: @@ -55,6 +53,16 @@ The BMC will take 2-5 minutes to reboot, check the status using: ``rpower -a /path/to/witherspoon.pnor.squashfs.tar + +If running ``rflash`` in Hierarchy, the firmware files must be accessible on the Service Nodes. + +**Note:** The ``-a`` option does an upload and activate in one step, after firmware is activated, use the ``rflash -l`` to view. The ``rflash`` command shows ``(*)`` as the active firmware and ``(+)`` on the firmware that requires reboot to become effective. Power on Host ------------- @@ -63,6 +71,9 @@ User the ``rpower`` command to power on the Host: :: rpower on +.. END_flashing_OpenBMC_Servers + +.. BEGIN_Validation_OpenBMC_firmware Validation ---------- @@ -77,3 +88,5 @@ Use one of the following commands to validate firmware levels are in sync: rflash -l | grep "\*" | xcoll + +.. END_Validation_OpenBMC_firmware diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/unattended.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/unattended.rst new file mode 100644 index 000000000..b4608367b --- /dev/null +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/unattended.rst @@ -0,0 +1,10 @@ +Unattended Firmware Flash +========================= + +.. include:: ./openbmc_common.rst + :start-after: BEGIN_unattended_OpenBMC_flashing + :end-before: END_unattended_OpenBMC_flashing + +.. include:: ./openbmc_common.rst + :start-after: BEGIN_Validation_OpenBMC_firmware + :end-before: END_Validation_OpenBMC_firmware diff --git a/docs/source/references/coral/cluster_mgmt/firmware/index.rst b/docs/source/references/coral/cluster_mgmt/firmware/index.rst index 1d105d896..08b0828bb 100644 --- a/docs/source/references/coral/cluster_mgmt/firmware/index.rst +++ b/docs/source/references/coral/cluster_mgmt/firmware/index.rst @@ -5,4 +5,4 @@ Power9 Firmware Update :maxdepth: 2 ipmi.rst - openbmc.rst + openbmc/index.rst diff --git a/docs/source/references/coral/cluster_mgmt/firmware/openbmc/index.rst b/docs/source/references/coral/cluster_mgmt/firmware/openbmc/index.rst new file mode 100644 index 000000000..4f841ef1a --- /dev/null +++ b/docs/source/references/coral/cluster_mgmt/firmware/openbmc/index.rst @@ -0,0 +1,8 @@ +OpenBMC Firmware Update +======================= + +.. toctree:: + :maxdepth: 2 + + unattended.rst + manually.rst diff --git a/docs/source/references/coral/cluster_mgmt/firmware/openbmc/manually.rst b/docs/source/references/coral/cluster_mgmt/firmware/openbmc/manually.rst new file mode 100644 index 000000000..1f3c88160 --- /dev/null +++ b/docs/source/references/coral/cluster_mgmt/firmware/openbmc/manually.rst @@ -0,0 +1,10 @@ +Manual Firmware Flash +===================== + +.. include:: ../../../../../guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst + :start-after: BEGIN_flashing_OpenBMC_Servers + :end-before: END_flashing_OpenBMC_Servers + +.. include:: ../../../../../guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst + :start-after: BEGIN_Validation_OpenBMC_firmware + :end-before: END_Validation_OpenBMC_firmware diff --git a/docs/source/references/coral/cluster_mgmt/firmware/openbmc/unattended.rst b/docs/source/references/coral/cluster_mgmt/firmware/openbmc/unattended.rst new file mode 100644 index 000000000..21e8d9915 --- /dev/null +++ b/docs/source/references/coral/cluster_mgmt/firmware/openbmc/unattended.rst @@ -0,0 +1,10 @@ +Unattended Firmware Flash +========================= + +.. include:: ../../../../../guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst + :start-after: BEGIN_unattended_OpenBMC_flashing + :end-before: END_unattended_OpenBMC_flashing + +.. include:: ../../../../../guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst + :start-after: BEGIN_Validation_OpenBMC_firmware + :end-before: END_Validation_OpenBMC_firmware From 8ed0cece2dcadc2ebbf52d048a5cc1786e0f8dd9 Mon Sep 17 00:00:00 2001 From: bybai Date: Thu, 8 Mar 2018 02:06:27 -0500 Subject: [PATCH 02/21] enhance rflash unattended doc --- .../management/advanced/rflash/openbmc/index.rst | 2 +- .../advanced/rflash/openbmc/openbmc_common.rst | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/index.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/index.rst index 4f841ef1a..804913d6d 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/index.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/index.rst @@ -4,5 +4,5 @@ OpenBMC Firmware Update .. toctree:: :maxdepth: 2 - unattended.rst manually.rst + unattended.rst diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst index 980fc8d83..6ad105759 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst @@ -2,12 +2,18 @@ Unattended flash of OpenBMC managed BMC means that xCAT will attempt to: -#. Upload and active BMC, PNOR or both depending on which files are provided. -#. Reboot the necessary components (BMC and/or HOST) to activate the firmware levels +#. Upload both BMC and PNOR +#. Activate both BMC and PNOR +#. If BMC state is ready, reboot BMC to apply BMC, or else, ``rflash`` will exit +#. If PNOR state is ready, and use ``--no-host-reboot`` option, ``rflash`` will not reboot HOST +#. If PNOR state is ready, and do not use ``--no-host-reboot`` option, ``rflash`` will reboot HOST to apply PNOR Use the following command to flash the firmware unattended: :: - rpower -d /path/to/directory + rflash -d /path/to/directory +Use the following command to flash the firmware unattended and not reboot HOST: :: + + rflash -d /path/to/directory --no-host-reboot If there are errors encountered during the flash process, take a look at the manual steps to continue flashing the BMC. From fe60fe04db881b9d94772e0fae21dbf51ecc710e Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Thu, 8 Mar 2018 17:24:27 +0800 Subject: [PATCH 03/21] Add libnl3 to ib.rhels7.ppc64le.pkglist --- xCAT-server/share/xcat/ib/netboot/rh/ib.rhels7.ppc64le.pkglist | 1 + 1 file changed, 1 insertion(+) diff --git a/xCAT-server/share/xcat/ib/netboot/rh/ib.rhels7.ppc64le.pkglist b/xCAT-server/share/xcat/ib/netboot/rh/ib.rhels7.ppc64le.pkglist index a7de3c96b..3b4b98fbc 100644 --- a/xCAT-server/share/xcat/ib/netboot/rh/ib.rhels7.ppc64le.pkglist +++ b/xCAT-server/share/xcat/ib/netboot/rh/ib.rhels7.ppc64le.pkglist @@ -6,6 +6,7 @@ tcsh gcc-gfortran lsof libnl +libnl3 libxml2-python python-devel redhat-rpm-config From 88925f99a8dd7d688a23ef5eaea183a74564e415 Mon Sep 17 00:00:00 2001 From: Victor Hu Date: Thu, 8 Mar 2018 15:12:36 -0500 Subject: [PATCH 04/21] Reverse installing xCAT-openbmc-py by default so we can require python dependencies --- xCAT-openbmc-py/xCAT-openbmc-py.spec | 3 +++ xCAT/xCAT.spec | 4 ---- xCATsn/xCATsn.spec | 4 ---- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/xCAT-openbmc-py/xCAT-openbmc-py.spec b/xCAT-openbmc-py/xCAT-openbmc-py.spec index c6e81a069..acfe6fdb5 100644 --- a/xCAT-openbmc-py/xCAT-openbmc-py.spec +++ b/xCAT-openbmc-py/xCAT-openbmc-py.spec @@ -18,6 +18,9 @@ AutoReqProv: no BuildArch: noarch Requires: xCAT-server +Requires: python-gevent >= 1.2.2-2 +Requires: python-greenlet >= 0.4.13-2 +Requires: python2-docopt python-requests python-paramiko python-scp %description xCAT-openbmc-py provides openbmc related functions. diff --git a/xCAT/xCAT.spec b/xCAT/xCAT.spec index 2f9c6d0eb..476b42109 100644 --- a/xCAT/xCAT.spec +++ b/xCAT/xCAT.spec @@ -91,10 +91,6 @@ Requires: ipmitool-xcat >= 1.8.17-1 %ifarch ppc ppc64 ppc64le Requires: ipmitool-xcat >= 1.8.17-1 %endif -%ifarch ppc64le -# only OpenBMC support -Requires: xCAT-openbmc-py -%endif %endif %if %notpcm diff --git a/xCATsn/xCATsn.spec b/xCATsn/xCATsn.spec index d2bdf7749..f8c3531f2 100644 --- a/xCATsn/xCATsn.spec +++ b/xCATsn/xCATsn.spec @@ -73,10 +73,6 @@ Requires: ipmitool-xcat >= 1.8.17-1 %ifarch ppc ppc64 ppc64le Requires: ipmitool-xcat >= 1.8.17-1 %endif -%ifarch ppc64le -# only OpenBMC support -Requires: xCAT-openbmc-py -%endif %endif %if %notpcm From eaf6b0eeb84cb238486f4bc670b8b39285d2803d Mon Sep 17 00:00:00 2001 From: Victor Hu Date: Thu, 8 Mar 2018 16:39:39 -0500 Subject: [PATCH 05/21] Adding documentation for installing xCAT-openbmc-py --- .../references/coral/cluster_mgmt/index.rst | 1 + .../coral/cluster_mgmt/scalability/index.rst | 7 ++++ .../cluster_mgmt/scalability/python/index.rst | 12 ++++++ .../scalability/python/install/disable.rst | 14 +++++++ .../scalability/python/install/index.rst | 12 ++++++ .../scalability/python/install/pip.rst | 22 ++++++++++ .../scalability/python/install/rpm.rst | 42 +++++++++++++++++++ .../scalability/python/performance.rst | 33 +++++++++++++++ 8 files changed, 143 insertions(+) create mode 100644 docs/source/references/coral/cluster_mgmt/scalability/index.rst create mode 100644 docs/source/references/coral/cluster_mgmt/scalability/python/index.rst create mode 100644 docs/source/references/coral/cluster_mgmt/scalability/python/install/disable.rst create mode 100644 docs/source/references/coral/cluster_mgmt/scalability/python/install/index.rst create mode 100644 docs/source/references/coral/cluster_mgmt/scalability/python/install/pip.rst create mode 100644 docs/source/references/coral/cluster_mgmt/scalability/python/install/rpm.rst create mode 100644 docs/source/references/coral/cluster_mgmt/scalability/python/performance.rst diff --git a/docs/source/references/coral/cluster_mgmt/index.rst b/docs/source/references/coral/cluster_mgmt/index.rst index 20b2bbcb8..acc9b2ea4 100644 --- a/docs/source/references/coral/cluster_mgmt/index.rst +++ b/docs/source/references/coral/cluster_mgmt/index.rst @@ -4,4 +4,5 @@ Cluster Management .. toctree:: :maxdepth: 2 + scalability/index.rst firmware/index.rst diff --git a/docs/source/references/coral/cluster_mgmt/scalability/index.rst b/docs/source/references/coral/cluster_mgmt/scalability/index.rst new file mode 100644 index 000000000..17c8d5edc --- /dev/null +++ b/docs/source/references/coral/cluster_mgmt/scalability/index.rst @@ -0,0 +1,7 @@ +Scalability +=========== + +.. toctree:: + :maxdepth: 2 + + python/index.rst diff --git a/docs/source/references/coral/cluster_mgmt/scalability/python/index.rst b/docs/source/references/coral/cluster_mgmt/scalability/python/index.rst new file mode 100644 index 000000000..8a5cdf551 --- /dev/null +++ b/docs/source/references/coral/cluster_mgmt/scalability/python/index.rst @@ -0,0 +1,12 @@ +Python framework +================ + +When testing the scale up of xCAT commands against OpenBMC REST API, it was evident that the Perl framework of xCAT did not scale well and was not sending commands to the BMCs in a true parallel fashion. + +The team investigated the possibility of using Python framework + +.. toctree:: + :maxdepth: 2 + + performance.rst + install/index.rst diff --git a/docs/source/references/coral/cluster_mgmt/scalability/python/install/disable.rst b/docs/source/references/coral/cluster_mgmt/scalability/python/install/disable.rst new file mode 100644 index 000000000..40c54c64b --- /dev/null +++ b/docs/source/references/coral/cluster_mgmt/scalability/python/install/disable.rst @@ -0,0 +1,14 @@ +Disable Python Framework +======================== + +By default, if ``xCAT-openbmc-py`` is installed and Python files are there, xCAT will default to running the Python framework. + +A site table attribute is created to allow the ability to control between Python and Perl. + +* To disable all Python code and revert to the Perl implementation: :: + + chdef -t site clustersite openbmcperl=ALL + +* To disable single commands, specify a command separated lists: :: + + chdef -t site clustersite openbmcperl="rpower,rbeacon" diff --git a/docs/source/references/coral/cluster_mgmt/scalability/python/install/index.rst b/docs/source/references/coral/cluster_mgmt/scalability/python/install/index.rst new file mode 100644 index 000000000..ec1f19ce7 --- /dev/null +++ b/docs/source/references/coral/cluster_mgmt/scalability/python/install/index.rst @@ -0,0 +1,12 @@ +Installation +============ + +A new RPM is created that contains the Python code: ``xCAT-openbmc-py``. The Python code requires additonal Python libraries that may not be available as an operating system provided package. The following will help resolve the dependencies. + + +.. toctree:: + :maxdepth: 2 + + rpm.rst + pip.rst + disable.rst diff --git a/docs/source/references/coral/cluster_mgmt/scalability/python/install/pip.rst b/docs/source/references/coral/cluster_mgmt/scalability/python/install/pip.rst new file mode 100644 index 000000000..344b7e7c4 --- /dev/null +++ b/docs/source/references/coral/cluster_mgmt/scalability/python/install/pip.rst @@ -0,0 +1,22 @@ +Using pip +========= + +A alternative method for installing the Python dependencies is using ``pip``. + +#. Download ``pip`` using one of the following methods: + + #. ``pip`` is provided in the EPEL repo as: ``python2-pip`` + + #. Follow the instructions to install from here: https://pip.pypa.io/en/stable/installing/ + +#. Use ``pip`` to install the following Python libraries: :: + + pip install gevent docopt requests paramiko scp + + +#. Install ``xCAT-openbmc-py`` using ``rpm`` with ``--nodeps``: :: + + cd xcat-core + rpm -ihv xCAT-openbmc-py*.rpm --nodeps + + diff --git a/docs/source/references/coral/cluster_mgmt/scalability/python/install/rpm.rst b/docs/source/references/coral/cluster_mgmt/scalability/python/install/rpm.rst new file mode 100644 index 000000000..32efaaa19 --- /dev/null +++ b/docs/source/references/coral/cluster_mgmt/scalability/python/install/rpm.rst @@ -0,0 +1,42 @@ +Using RPM (recommended) +======================= + +**Support is only for RHEL 7.5 for Power LE (Power 9)** + +The following repositories should be configured on your Management Node (and Service Nodes). + + * RHEL 7.5 OS Repository + * RHEL 7.5 Extras Repository + * RHEL 7 EPEL Repo (https://fedoraproject.org/wiki/EPEL) + * Fedora28 Repo (for ``gevent``, ``greenlet``) + +#. Configure the MN/SN to the RHEL 7.5 OS Repo + +#. Configure the MN/SN to the RHEL 7.5 Extras Repo + +#. Configure the MN/SN to the EPEL Repo (https://fedoraproject.org/wiki/EPEL) + +#. Create a local Fedora28 Repo and Configure the MN/SN to the FC28 Repo + + Here's an example to configure the Fedora 28 repo at ``/install/repos/fc28`` + + #. Make the target repo directory on the MN: :: + + mkdir -p /install/repos/fc28/ppc64le/Packages + + #. Download the rpms from the Internet: :: + + cd /install/repos/fc28/ppc64le/Packages + wget https://www.rpmfind.net/linux/fedora-secondary/development/rawhide/Everything/ppc64le/os/Packages/p/python2-gevent-1.2.2-2.fc28.ppc64le.rpm + wget https://www.rpmfind.net/linux/fedora-secondary/development/rawhide/Everything/ppc64le/os/Packages/p/python2-greenlet-0.4.13-2.fc28.ppc64le.rpm + + #. Create a yum repo in that directory: :: + + cd /install/repos/fc28/ppc64le/ + createrepo . + +#. Install ``xCAT-openbmc-py`` using ``yum``: :: + + yum install xCAT-openbmc-py + + **Note**: The install will fail if the dependencies cannot be met. diff --git a/docs/source/references/coral/cluster_mgmt/scalability/python/performance.rst b/docs/source/references/coral/cluster_mgmt/scalability/python/performance.rst new file mode 100644 index 000000000..43460961b --- /dev/null +++ b/docs/source/references/coral/cluster_mgmt/scalability/python/performance.rst @@ -0,0 +1,33 @@ +Performance +=========== + +Supported Commands +------------------ + +The following commands are currently supported: + ++----------------+-----------+-------------+----------------------------------+ +|Command |Support |Release |Notes | ++================+===========+=============+==================================+ +| rpower | Yes | 2.13.11 | | ++----------------+-----------+-------------+----------------------------------+ +| rinv | Yes | 2.13.11 | | ++----------------+-----------+-------------+----------------------------------+ +| rbeacon | Yes | 2.13.11 | | ++----------------+-----------+-------------+----------------------------------+ +| rspconfig | No | | | ++----------------+-----------+-------------+----------------------------------+ +| rsetboot | Yes | 2.13.11 | | ++----------------+-----------+-------------+----------------------------------+ +| rvitals | Yes | 2.13.11 | | ++----------------+-----------+-------------+----------------------------------+ +| rflash | No | | | ++----------------+-----------+-------------+----------------------------------+ +| reventlog | No | | | ++----------------+-----------+-------------+----------------------------------+ + + +Data +---- + +TBD From 6da5a510100351aa61fe19db1da95109b0c41560 Mon Sep 17 00:00:00 2001 From: bybai Date: Thu, 8 Mar 2018 21:36:55 -0500 Subject: [PATCH 06/21] enhance rflash doc --- .../advanced/rflash/openbmc/openbmc_common.rst | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst index 6ad105759..50404a5a8 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/advanced/rflash/openbmc/openbmc_common.rst @@ -1,17 +1,19 @@ .. BEGIN_unattended_OpenBMC_flashing -Unattended flash of OpenBMC managed BMC means that xCAT will attempt to: +Unattended flash of OpenBMC firmware will do the following events: -#. Upload both BMC and PNOR -#. Activate both BMC and PNOR -#. If BMC state is ready, reboot BMC to apply BMC, or else, ``rflash`` will exit -#. If PNOR state is ready, and use ``--no-host-reboot`` option, ``rflash`` will not reboot HOST -#. If PNOR state is ready, and do not use ``--no-host-reboot`` option, ``rflash`` will reboot HOST to apply PNOR +#. Upload both BMC firmware file and PNOR firmware file +#. Activate both BMC firmware and PNOR firmware +#. If BMC firmware becomes activate, reboot BMC to apply new BMC firmware, or else, ``rflash`` will exit +#. If BMC itself state is ``NotReady``, ``rflash`` will exit +#. If BMC itself state is ``Ready``, and use ``--no-host-reboot`` option, ``rflash`` will not reboot the compute node +#. If BMC itself state is ``Ready``, and do not use ``--no-host-reboot`` option, ``rflash`` will reboot the compute node to apply PNOR firmware Use the following command to flash the firmware unattended: :: rflash -d /path/to/directory -Use the following command to flash the firmware unattended and not reboot HOST: :: + +Use the following command to flash the firmware unattended and not reboot the compute node: :: rflash -d /path/to/directory --no-host-reboot @@ -46,7 +48,7 @@ Use the rflash command to upload and activate the PNOR firmware: :: If running ``rflash`` in Hierarchy, the firmware files must be accessible on the Service Nodes. -**Note:** The ``-a`` option does an upload and activate in one step, after firmware is activated, use the ``rflash -l`` to view. The ``rflash`` command shows ``(*)`` as the active firmware and ``(+)`` on the firmware that requires reboot to become effective. +**Note:** If a .tar file is provided, the ``-a`` option does an upload and activate in one step. If an ID is provided, the ``-a`` option just does activate the specified firmware. After firmware is activated, use the ``rflash -l`` to view. The ``rflash`` command shows ``(*)`` as the active firmware and ``(+)`` on the firmware that requires reboot to become effective. Reboot the BMC -------------- From a03e17dadfa2562c46fbc5d93bd0e38310d08f2e Mon Sep 17 00:00:00 2001 From: chenglch Date: Fri, 9 Mar 2018 10:30:41 +0800 Subject: [PATCH 07/21] Fix indent problem for the comment lines For the usability issue, add more spaces to avoid of some errors when deleting the `#`. --- xCAT-server/lib/perl/xCAT/Goconserver.pm | 34 ++++++++++++------------ 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/xCAT-server/lib/perl/xCAT/Goconserver.pm b/xCAT-server/lib/perl/xCAT/Goconserver.pm index a28d398e0..172e1010e 100644 --- a/xCAT-server/lib/perl/xCAT/Goconserver.pm +++ b/xCAT-server/lib/perl/xCAT/Goconserver.pm @@ -596,23 +596,23 @@ sub build_conf { " reconnect_interval: 10 # retry interval in second if console could not be connected\n". " logger: # multiple logger targets could be specified\n". " file: # file logger, valid fields: name,logdir. Accept array in yaml format\n". - " - name: default # the identity name customized by user\n". - " logdir: ".CONSOLE_LOG_DIR." # default log directory of xcat\n". - " # - name: goconserver \n". - " # logdir: /var/log/goconserver/nodes \n". - " # tcp: # valied fields: name, host, port, timeout, ssl_key_file, ssl_cert_file, ssl_ca_cert_file, ssl_insecure\n". - " # - name: logstash \n". - " # host: 127.0.0.1 \n". - " # port: 9653 \n". - " # timeout: 3 # default 3 second\n". - " # - name: filebeat \n". - " # host: \n". - " # port: \n". - " # udp: # valid fiedls: name, host, port, timeout\n". - " # - name: rsyslog \n". - " # host: \n". - " # port: \n". - " # timeout: # default 3 second\n"; + " - name: default # the identity name customized by user\n". + " logdir: ".CONSOLE_LOG_DIR." # default log directory of xcat\n". + " #- name: goconserver \n". + " # logdir: /var/log/goconserver/nodes \n". + " #tcp: # valied fields: name, host, port, timeout, ssl_key_file, ssl_cert_file, ssl_ca_cert_file, ssl_insecure\n". + " #- name: logstash \n". + " # host: 127.0.0.1 \n". + " # port: 9653 \n". + " # timeout: 3 # default 3 second\n". + " #- name: filebeat \n". + " # host: \n". + " # port: \n". + " #udp: # valid fiedls: name, host, port, timeout\n". + " #- name: rsyslog \n". + " # host: 127.0.0.1 \n". + " # port: 512 \n". + " # timeout: 3 # default 3 second\n"; my $file; my $ret = open ($file, '>', '/etc/goconserver/server.conf'); From 0f08fb31a0d49d21029878078d936ad4806ceeda Mon Sep 17 00:00:00 2001 From: Victor Hu Date: Thu, 8 Mar 2018 21:49:00 -0500 Subject: [PATCH 08/21] Install first, then performance section --- .../references/coral/cluster_mgmt/scalability/python/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/references/coral/cluster_mgmt/scalability/python/index.rst b/docs/source/references/coral/cluster_mgmt/scalability/python/index.rst index 8a5cdf551..40197bc6e 100644 --- a/docs/source/references/coral/cluster_mgmt/scalability/python/index.rst +++ b/docs/source/references/coral/cluster_mgmt/scalability/python/index.rst @@ -8,5 +8,5 @@ The team investigated the possibility of using Python framework .. toctree:: :maxdepth: 2 - performance.rst install/index.rst + performance.rst From 11f469792b3f0ad5891df70bf2dd45f9870803c2 Mon Sep 17 00:00:00 2001 From: hu-weihua Date: Fri, 9 Mar 2018 00:33:49 -0500 Subject: [PATCH 09/21] Modify all fullwidth colon in test case --- xCAT-test/autotest/testcase/mkdef/cases0 | 18 +++++++++--------- xCAT-test/autotest/testcase/rmdef/cases0 | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/xCAT-test/autotest/testcase/mkdef/cases0 b/xCAT-test/autotest/testcase/mkdef/cases0 index 38bfacf91..547992ffd 100644 --- a/xCAT-test/autotest/testcase/mkdef/cases0 +++ b/xCAT-test/autotest/testcase/mkdef/cases0 @@ -187,7 +187,7 @@ os:linux description:create a node with cec template once cmd:result=`lsdef | grep auto_test_cec_node_1`; if [[ $result =~ "auto_test_cec_node_1" ]]; then echo $result; noderm auto_test_cec_node_1; fi cmd:mkdef -t node -o auto_test_cec_node_1 --template cec-template serial=test mtm=test hcp=test -check：rc==0 +check:rc==0 check:output=~1 object definitions have been created or modified cmd:lsdef auto_test_cec_node_1 check:output=~Object name\: auto\_test\_cec\_node\_1 @@ -214,7 +214,7 @@ cmd:lsdef --template auto_test_invalid_template check:rc==1 check:output=~Error\: Could not find auto\_test\_invalid\_template in xCAT templates cmd:mkdef -t node -o auto_test_node --template auto_test_invalid_template -check：rc==1 +check:rc==1 check:output=~Error\: Could not find the template object named \'auto\_test\_invalid\_template\' of type \'node\' end @@ -224,11 +224,11 @@ description:create a node with a node template, using cec template to create nod cmd:result=`lsdef | grep auto_test_cec_node_1`; if [[ $result =~ "auto_test_cec_node_1" ]]; then echo $result; noderm auto_test_cec_node_1; fi cmd:result=`lsdef | grep auto_test_cec_node_2`; if [[ $result =~ "auto_test_cec_node_2" ]]; then echo $result; noderm auto_test_cec_node_2; fi cmd:mkdef -t node -o auto_test_cec_node_1 --template cec-template serial=test mtm=test hcp=test groups=test_template -check：rc==0 +check:rc==0 check:output=~1 object definitions have been created or modified check:output=~created cmd:mkdef -t node -o auto_test_cec_node_2 --template auto_test_cec_node_1 serial=test2 mtm=test2 hcp=test2 -check：rc==0 +check:rc==0 check:output=~1 object definitions have been created or modified cmd:lsdef auto_test_cec_node_2 check:output=~Object name\: auto\_test\_cec\_node\_2 @@ -263,7 +263,7 @@ cmd:mkdef -t node -o auto_test_cec_node_1 --template cec-template serial=test mt check:rc==1 check:output=~Error\: The attribute \"hcp\" must be specified! cmd:mkdef -t node -o auto_test_cec_node_1 --template cec-template serial=test mtm=test hcp=test -check：rc==0 +check:rc==0 check:output=~1 object definitions have been created or modified cmd:lsdef auto_test_cec_node_1 check:output=~Object name\: auto\_test\_cec\_node\_1 @@ -287,10 +287,10 @@ description:create node named cec-template with cec template at beginning, the n cmd:result=`lsdef | grep cec-template`; if [[ $result =~ "cec-template" ]]; then echo $result; noderm cec-template; fi cmd:result=`lsdef | grep auto_test_cec_node`; if [[ $result =~ "auto_test_cec_node" ]]; then echo $result; noderm auto_test_cec_node; fi cmd:mkdef -t node -o cec-template --template cec-template serial=test mtm=test hcp=test groups=test_template_priority -check：rc==0 +check:rc==0 check:output=~1 object definitions have been created or modified cmd:mkdef -t node -o auto_test_cec_node --template cec-template serial=test2 mtm=test2 hcp=test2 -check：rc==0 +check:rc==0 check:output=~1 object definitions have been created or modified cmd:lsdef auto_test_cec_node check:output=~Object name\: auto\_test\_cec\_node @@ -306,9 +306,9 @@ check:output=~hcp\=test2 check:output=~mtm\=test2 check:output=~serial\=test2 cmd:noderm cec-template -check：rc==0 +check:rc==0 cmd:noderm auto_test_cec_node -check：rc==0 +check:rc==0 end start:mkdef_template_diskless_osimage_rootimgdir diff --git a/xCAT-test/autotest/testcase/rmdef/cases0 b/xCAT-test/autotest/testcase/rmdef/cases0 index 50bbe14e9..5133ae8aa 100644 --- a/xCAT-test/autotest/testcase/rmdef/cases0 +++ b/xCAT-test/autotest/testcase/rmdef/cases0 @@ -134,7 +134,7 @@ os:linux description:try to delete a template, then error messages appear cmd:result=`lsdef | grep switch-template`; if [[ $result =~ "switch-template" ]]; then echo $result; noderm switch-template; fi cmd:rmdef switch-template -check：rc==1 +check:rc==1 check:output=~Error\: Could not find an object named \'switch-template\' of type \'node\' check:output=~No objects have been removed from the xCAT database. end From 55af8ca8c4c8a1ae1b86db0f217cc88483a86c98 Mon Sep 17 00:00:00 2001 From: Bin Xu Date: Fri, 9 Mar 2018 13:27:35 +0800 Subject: [PATCH 10/21] remove the dependency, Load SOAP module dynamically --- perl-xCAT/xCAT/vboxService.pm | 2 +- xCAT-server/lib/xcat/plugins/vbox.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/perl-xCAT/xCAT/vboxService.pm b/perl-xCAT/xCAT/vboxService.pm index 2f7b7130e..27f658ab9 100644 --- a/perl-xCAT/xCAT/vboxService.pm +++ b/perl-xCAT/xCAT/vboxService.pm @@ -813,7 +813,7 @@ my %methods = ( }, # end IConsole_getPowerButtonHandled ); # end my %methods -use SOAP::Lite; # vbox.pm requires SOAP::Lite before requiring vboxService.pm, so we can check for SOAP::Lite dynamically +#use SOAP::Lite; # vbox.pm requires SOAP::Lite before requiring vboxService.pm, so we can check for SOAP::Lite dynamically use Exporter; use Carp (); diff --git a/xCAT-server/lib/xcat/plugins/vbox.pm b/xCAT-server/lib/xcat/plugins/vbox.pm index 3ed06b262..be6578034 100644 --- a/xCAT-server/lib/xcat/plugins/vbox.pm +++ b/xCAT-server/lib/xcat/plugins/vbox.pm @@ -105,7 +105,7 @@ sub process_request my $soapsupport = eval { require SOAP::Lite; }; unless ($soapsupport) { #Still no SOAP::Lite module - $callback->({ error => "SOAP::Lite perl module missing, unable to fulfill Virtual Box plugin requirements", errorcode => [42] }); + $callback->({ error => "SOAP::Lite perl module missing. Install perl-SOAP-Lite before running commands on Virtual Box nodes.", errorcode => [42] }); return []; } require xCAT::vboxService; From f685d458b432bb2cfc604eb0cc3b621b9b93676d Mon Sep 17 00:00:00 2001 From: chenglch Date: Tue, 6 Mar 2018 14:58:20 +0800 Subject: [PATCH 11/21] Add doc to enable goconserver by default Add the steps in documentation to enable goconserver by default. --- .../advanced/goconserver/configuration.rst | 119 ++++++++++++++++++ docs/source/advanced/goconserver/index.rst | 14 +++ .../advanced/goconserver/quickstart.rst | 20 +++ docs/source/advanced/goconserver/rest.rst | 5 + docs/source/advanced/index.rst | 1 + .../ppc64le/management/basic/rcons.rst | 42 +++++-- 6 files changed, 191 insertions(+), 10 deletions(-) create mode 100644 docs/source/advanced/goconserver/configuration.rst create mode 100644 docs/source/advanced/goconserver/index.rst create mode 100644 docs/source/advanced/goconserver/quickstart.rst create mode 100644 docs/source/advanced/goconserver/rest.rst diff --git a/docs/source/advanced/goconserver/configuration.rst b/docs/source/advanced/goconserver/configuration.rst new file mode 100644 index 000000000..5f6a50d61 --- /dev/null +++ b/docs/source/advanced/goconserver/configuration.rst @@ -0,0 +1,119 @@ +Configuration +============= + +Location +-------- + +The configuration file for ``goconserver`` is located at ``/etc/goconserver/server.conf``. +When the configuration is changed, reload using: ``systemctl restart goconserver.service``. +An example for the configuration could be found from +`Example Conf `_. + +Tag For xCAT +------------ + +xCAT generates a configuration file that includes a identifier on the first +line. For example: :: + + #generated by xcat Version 2.13.10 (git commit 7fcd37ffb7cec37c021ab47d4baec151af547ac0, built Thu Jan 25 07:15:36 EST 2018) + +``makegocons`` checks for this token and will not make changes to the +configuration file if it exists. This gives the user the ability to customize +the configuration based on their specific site configuration. + + +Multiple Output Plugins +----------------------- + +``goconserver`` support console redirection to multiple targets with ``file``, +``tcp`` and ``udp`` logger plugins. The entry could be found like below: :: + + console: + # the console session port for client(congo) to connect. + port: 12430 + + logger: + # for file logger + file: + # multiple file loggers could be specified + # valid fields: name, logdir + - name: default + logdir: /var/log/goconserver/nodes/ + - name: xCAT + logdir: /var/log/consoles + + tcp: + - name: logstash + host: briggs01 + port: 9653 + ssl_key_file: /etc/xcat/cert/server-cred.pem + ssl_cert_file: /etc/xcat/cert/server-cred.pem + ssl_ca_cert_file: /etc/xcat/cert/ca.pem + + - name: rsyslog + host: sn02 + port: 9653 + + udp: + - name: filebeat + host: 192.168.1.5 + port: 512 + +With the configuration above, the console log files for each node would be written in +both ``/var/log/goconserver/nodes/.log`` and ``/var/log/consoles/.log``. +In addition, console log content will be redirected into remote services +specified in the tcp and udp sections. + +Verification +------------ + +To check if ``goconserver`` works correctly, see the log file ``/var/log/goconserver/server.log``. + + #. Check if TCP logger has been activated. + + When starting ``goconserver``, if the log message is like below, it + means the TCP configuration has been activated. :: + + {"file":"github.com/xcat2/goconserver/console/logger/tcp.go (122)","level":"info","msg":"Starting TCP publisher: logstash","time":"2018-03-02T21:15:35-05:00"} + {"file":"github.com/xcat2/goconserver/console/logger/tcp.go (122)","level":"info","msg":"Starting TCP publisher: sn02","time":"2018-03-02T21:15:35-05:00"} + + #. Debug when encounter error about TCP logger + + If the remote service is not started or the network is unreachable, the + log message would be like below. :: + + {"file":"github.com/xcat2/goconserver/console/logger/tcp.go (127)","level":"error","msg":"TCP publisher logstash: dial tcp 10.6.27.1:9653: getsockopt: connection refused","time":"2018-03-07T21:12:58-05:00"} + + Check the service status and the network configuration including the + ``selinux`` and ``iptable rules``. When the remote service works + correctly, TCP or UDP logger of ``goconserver`` would recover automatically. + +Reconnect Interval +------------------ + +If console node is defined with ``ondemand=false``, when the console connection +could not be established, ``goconserver`` would reconnect automatically. The +interval time could be specified at :: + + console: + # retry interval in second if console could not be connected. + reconnect_interval: 10 + +Performance Tuning +------------------ + +Adjust the worker numbers to leverage multi-core processor performance based on +the site configuration. :: + + global: + # the max cpu cores for workload + worker: 4 + +Debug +----- + +The log level for ``goconserver`` is defined in ``/etc/goconserver/server.conf`` :: + + global: + # debug, info, warn, error, fatal, panic + log_level: info diff --git a/docs/source/advanced/goconserver/index.rst b/docs/source/advanced/goconserver/index.rst new file mode 100644 index 000000000..39f3ff2cc --- /dev/null +++ b/docs/source/advanced/goconserver/index.rst @@ -0,0 +1,14 @@ +Go Conserver +============ + +``goconserver`` is a conserver replacement written in `Go `_ +programming language. For more information, see https://github.com/xcat2/goconserver/ + +.. toctree:: + + :maxdepth: 2 + + quickstart.rst + configuration.rst + rest.rst + diff --git a/docs/source/advanced/goconserver/quickstart.rst b/docs/source/advanced/goconserver/quickstart.rst new file mode 100644 index 000000000..96559668b --- /dev/null +++ b/docs/source/advanced/goconserver/quickstart.rst @@ -0,0 +1,20 @@ +Quickstart +========== + +To enable ``goconserver``, execute the following steps: + +#. Install the ``goconserver`` RPM: :: + + yum install goconserver + + +#. If upgrading xCAT running ``conserver``, stop it first: :: + + systemctl stop conserver.service + + +#. Start ``goconserver`` and create the console configuration files with a single command :: + + makegocons + + The new console logs will start logging to ``/var/log/consoles/.log`` \ No newline at end of file diff --git a/docs/source/advanced/goconserver/rest.rst b/docs/source/advanced/goconserver/rest.rst new file mode 100644 index 000000000..81c112786 --- /dev/null +++ b/docs/source/advanced/goconserver/rest.rst @@ -0,0 +1,5 @@ +REST API +======== + +``goconserver`` provides REST API interface to manage the node sessions. For +detail, see `REST `_. diff --git a/docs/source/advanced/index.rst b/docs/source/advanced/index.rst index 820e899d8..b2c45af78 100755 --- a/docs/source/advanced/index.rst +++ b/docs/source/advanced/index.rst @@ -8,6 +8,7 @@ Advanced Topics cluster_maintenance/index.rst migration/index.rst confluent/index.rst + goconserver/index.rst docker/index.rst domain_name_resolution/index.rst gpu/index.rst diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/basic/rcons.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/basic/rcons.rst index 396880103..1addf7997 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/basic/rcons.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/management/basic/rcons.rst @@ -28,7 +28,37 @@ Troubleshooting General ``````` -The xCAT ``rcons`` command relies on conserver (http://www.conserver.com/). The ``conserver`` package should have been installed with xCAT as it's part of the xCAT dependency package. If you are having problems seeing the console, try the following. +``xCAT`` has been integrated with 3 kinds of console server service, they are + + - `conserver `_ + - `goconserver `_ + - `confluent `_ + +``rcons`` command relies on one of them. The ``conserver`` and ``goconserver`` +packages should have been installed with xCAT as they are part of the xCAT +dependency packages. If you hope to try ``confluent``, +see `confluent `_. + +For systemd based systems, ``goconserver`` is used by default. If you are +having problems seeing the console, try the following. + + #. Make sure ``goconserver`` is configured by running ``makegocons``. + + #. Check if ``goconserver`` is up and running :: + + systemctl status goconserver.service + + #. If ``goconserver`` is not running, start the service using: :: + + systemctl start goconserver.service + + #. Try ``makegocons -q []`` to verify if the node has been registered. + + #. Invoke the console again: ``rcons `` + +More details for goconserver, see `goconserver documentation `_. + +**[Deprecated]** If ``conserver`` is used, try the following. #. Make sure ``conserver`` is configured by running ``makeconservercf``. @@ -42,12 +72,4 @@ The xCAT ``rcons`` command relies on conserver (http://www.conserver.com/). The [sysvinit] service conserver start [systemd] systemctl start conserver.service - #. After this, try invoking the console again: ``rcons `` - - -OpenBMC Specific -```````````````` - - #. For OpenBMC managed servers, the root user must be able to ssh passwordless to the BMC for the ``rcons`` function to work. - - Copy the ``/root/.ssh/id_rsa.pub`` public key to the BMC's ``~/.ssh/authorized_keys`` file. + #. Invoke the console again: ``rcons `` From 5efb6e70caf650e8490106d8b47753e94a417c18 Mon Sep 17 00:00:00 2001 From: chenglch Date: Fri, 9 Mar 2018 14:48:09 +0800 Subject: [PATCH 12/21] Use makegocons instead of makeconservercf during discovery and provision --- .../compute_node/changing_hostname_ip.rst | 8 ++++---- .../mgmt_node/changing_hostname_ip.rst | 8 ++++---- .../admin-guides/manage_clusters/common/kvm/manage_vm.rst | 2 +- .../ppc64le/discovery/mtms/discovery_using_defined.rst | 2 +- .../ppc64le/discovery/mtms/discovery_using_dhcp.rst | 4 ++-- .../manage_clusters/ppc64le/discovery/pbmc_discovery.rst | 2 +- .../ppc64le/discovery/pbmc_discovery_with_bmcdiscover.rst | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/source/advanced/cluster_maintenance/compute_node/changing_hostname_ip.rst b/docs/source/advanced/cluster_maintenance/compute_node/changing_hostname_ip.rst index 10b7a69c1..7dac634fd 100644 --- a/docs/source/advanced/cluster_maintenance/compute_node/changing_hostname_ip.rst +++ b/docs/source/advanced/cluster_maintenance/compute_node/changing_hostname_ip.rst @@ -18,9 +18,9 @@ Remove Old Provision Environment makedhcp -d -#. Remove the nodes from the conserver configuration :: +#. Remove the nodes from the goconserver configuration :: - makeconservercf -d + makegocons -d Change Definition ----------------- @@ -76,6 +76,6 @@ Update The Provision Environment makedhcp -a -#. Configure the new names in conserver :: +#. Configure the new names in goconserver :: - makeconservercf + makegocons diff --git a/docs/source/advanced/cluster_maintenance/mgmt_node/changing_hostname_ip.rst b/docs/source/advanced/cluster_maintenance/mgmt_node/changing_hostname_ip.rst index 72282f3fb..5dbccfa64 100644 --- a/docs/source/advanced/cluster_maintenance/mgmt_node/changing_hostname_ip.rst +++ b/docs/source/advanced/cluster_maintenance/mgmt_node/changing_hostname_ip.rst @@ -190,9 +190,9 @@ Then update the following in xCAT: "1.4","new_MN_name",,,,,,"trusted",,`` -* Setup up conserver with new credentials :: +* Setup up goconserver with new credentials :: - makeconservercf + makegocons External DNS Server Changed --------------------------- @@ -262,9 +262,9 @@ If it exists, then use the return name and do the following: makedhcp -a - - Add the MN to conserver :: + - Add the MN to goconserver :: - makeconservercf + makegocons Update the genesis packages --------------------------- diff --git a/docs/source/guides/admin-guides/manage_clusters/common/kvm/manage_vm.rst b/docs/source/guides/admin-guides/manage_clusters/common/kvm/manage_vm.rst index 849f080f3..16d6012d9 100644 --- a/docs/source/guides/admin-guides/manage_clusters/common/kvm/manage_vm.rst +++ b/docs/source/guides/admin-guides/manage_clusters/common/kvm/manage_vm.rst @@ -161,7 +161,7 @@ When the VM has been created and powered on, choose one of the following methods * Use **rcons/wcons** on xCAT management node to open text console: :: chdef vm1 cons=kvm - makeconservercf vm1 + makegocons vm1 rcons vm1 * Connect to virtual machine through vnc console diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_defined.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_defined.rst index 9ea41fc17..1eb2d3d68 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_defined.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_defined.rst @@ -126,7 +126,7 @@ The BMC IP address is obtained by the open range dhcp server and the plan in thi Configure the conserver for the **discovered** node to watch the discovery process using ``rcons``:: - makeconservercf node-8247-22l-10112ca + makegocons node-8247-22l-10112ca In another terminal window, open the remote console: :: diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_dhcp.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_dhcp.rst index 5b22af650..b5e083ef7 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_dhcp.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_dhcp.rst @@ -99,9 +99,9 @@ The BMC IP address is obtained by the open range dhcp server and the plan is to #. **[Optional]** Monitor the node discovery process using rcons - Configure the conserver for the **predefined** node to watch the discovery process using ``rcons``:: + Configure the goconserver for the **predefined** node to watch the discovery process using ``rcons``:: - makeconservercf cn01 + makegocons cn01 In another terminal window, open the remote console: :: diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/pbmc_discovery.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/pbmc_discovery.rst index d2ad59575..d6c02db08 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/pbmc_discovery.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/pbmc_discovery.rst @@ -34,5 +34,5 @@ To start discovery process, just need to power on the PBMC node remotely with th **[Optional]** If you'd like to monitor the discovery process, you can use:: chdef Server-8247-22L-SN10112CA cons=ipmi - makeconservercf + makegocons rcons Server-8247-22L-SN10112CA diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/pbmc_discovery_with_bmcdiscover.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/pbmc_discovery_with_bmcdiscover.rst index 3b3245171..bea12d592 100644 --- a/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/pbmc_discovery_with_bmcdiscover.rst +++ b/docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/pbmc_discovery_with_bmcdiscover.rst @@ -25,5 +25,5 @@ To start discovery process, just need to power on the PBMC node remotely with th **[Optional]** If you'd like to monitor the discovery process, you can use:: - makeconservercf node-8247-42l-10112ca + makegocons node-8247-42l-10112ca rcons node-8247-42l-10112ca From 6d3d340849de5bef75ee6b41753ed86d9cbe754d Mon Sep 17 00:00:00 2001 From: Bin Xu Date: Fri, 9 Mar 2018 14:56:22 +0800 Subject: [PATCH 13/21] check if agent exists in process_request and give more clear message. --- xCAT-server/lib/perl/xCAT/OPENBMC.pm | 11 +++++++---- xCAT-server/lib/xcat/plugins/openbmc2.pm | 4 ++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/xCAT-server/lib/perl/xCAT/OPENBMC.pm b/xCAT-server/lib/perl/xCAT/OPENBMC.pm index 7e530c24f..2cecf635f 100644 --- a/xCAT-server/lib/perl/xCAT/OPENBMC.pm +++ b/xCAT-server/lib/perl/xCAT/OPENBMC.pm @@ -69,11 +69,14 @@ sub acquire_lock { flock($lock_fd, LOCK_EX) or return undef; return $lock_fd; } -sub start_python_agent { - if (! -e $PYTHON_AGENT_FILE) { - xCAT::MsgUtils->message("S", "start_python_agent() Error: '$PYTHON_AGENT_FILE' does not exist"); - return undef; + +sub exists_python_agent { + if ( -e $PYTHON_AGENT_FILE) { + return 1; } + return 0; +} +sub start_python_agent { if (!defined(acquire_lock())) { xCAT::MsgUtils->message("S", "start_python_agent() Error: Failed to acquire lock"); diff --git a/xCAT-server/lib/xcat/plugins/openbmc2.pm b/xCAT-server/lib/xcat/plugins/openbmc2.pm index e5b038531..1a3cac6e6 100644 --- a/xCAT-server/lib/xcat/plugins/openbmc2.pm +++ b/xCAT-server/lib/xcat/plugins/openbmc2.pm @@ -117,6 +117,10 @@ sub process_request { my $request = shift; $callback = shift; + if (!xCAT::OPENBMC::exists_python_agent()) { + xCAT::MsgUtils->message("E", { data => ["The xCAT Python agent does not exist. Check if xCAT-openbmc-py package is installed on management node and service nodes."] }, $callback); + return; + } # If we can't start the python agent, exit immediately my $pid = xCAT::OPENBMC::start_python_agent(); if (!defined($pid)) { From fcd98653433e3953e0db71ea5f80465b65065339 Mon Sep 17 00:00:00 2001 From: immarvin Date: Fri, 9 Mar 2018 04:32:21 -0500 Subject: [PATCH 14/21] add usercase for xcat-inventory --- docs/source/advanced/index.rst | 1 + .../xcat-inventory/define_create_cluster.rst | 28 +++++++++++ docs/source/advanced/xcat-inventory/index.rst | 21 ++++++++ .../version_control_inventory.rst | 50 +++++++++++++++++++ 4 files changed, 100 insertions(+) create mode 100644 docs/source/advanced/xcat-inventory/define_create_cluster.rst create mode 100644 docs/source/advanced/xcat-inventory/index.rst create mode 100644 docs/source/advanced/xcat-inventory/version_control_inventory.rst diff --git a/docs/source/advanced/index.rst b/docs/source/advanced/index.rst index 820e899d8..a951d2b77 100755 --- a/docs/source/advanced/index.rst +++ b/docs/source/advanced/index.rst @@ -25,3 +25,4 @@ Advanced Topics softlayer/index.rst sysclone/index.rst zones/index.rst + xcat-inventory/index.rst diff --git a/docs/source/advanced/xcat-inventory/define_create_cluster.rst b/docs/source/advanced/xcat-inventory/define_create_cluster.rst new file mode 100644 index 000000000..9a2dce023 --- /dev/null +++ b/docs/source/advanced/xcat-inventory/define_create_cluster.rst @@ -0,0 +1,28 @@ +Define and create your first xCAT cluster easily +================================================ + +The inventory templates for 2 kinds of typical xCAT cluster is shipped. You can create your first xCAT cluster easily by making several modifications on the template. The templates can be found under ``/opt/xcat/share/xcat/inventory_templates`` on management node with ``xcat-inventory`` installed. + +Currently, the inventory templates includes: + +1. flat_cluster_template.yaml: + + a flat baremetal cluster, including **openbmc controlled PowerLE servers**, **IPMI controlled Power servers(commented out)**, **X86_64 servers(commented out)** + +2. flat_kvm_cluster_template.yaml: a flat KVM based Virtual Machine cluster, including **PowerKVM based VM nodes**, **KVM based X86_64 VM nodes(commented out)** + +The steps to create your first xCAT cluster is: + +1. create a customized cluster inventory file "mycluster.yaml" based on ``flat_cluster_template.yaml`` :: + + cp /opt/xcat/share/xcat/inventory_templates/flat_cluster_template.yaml /git/cluster/mycluster.yaml + +2. custmize the cluster inventory file "mycluster.yaml" by modifying the attributs in the line under token ``#CHANGEME`` according to the setup of your phisical cluster. You can create new node definition by duplicating and modifying the node definition in the template. + +3. import the cluster inventory file :: + + xcat-inventory import -f /git/cluster/mycluster.yaml + +Now you have your 1st xCAT cluster, you can start bring up the cluster by provision nodes. + + diff --git a/docs/source/advanced/xcat-inventory/index.rst b/docs/source/advanced/xcat-inventory/index.rst new file mode 100644 index 000000000..5c7c4829b --- /dev/null +++ b/docs/source/advanced/xcat-inventory/index.rst @@ -0,0 +1,21 @@ +xcat-inventory +============== + +`xcat-inventory `_ is an inventory tool for the cluster managed by xCAT. Its features includes: + +* a object based view of the cluster inventory, which is flexible, extensible and well formatted + +* interfaces to export/import the cluster inventory data in yaml/json format, which can be then managed under source control + +* inventory templates for typical clusters, which help user to defines a cluster easily + +* ability to intergrate with Ansible(Comming Soon) + + +This section presents 2 typical user case of ``xcat-inventory`` + +.. toctree:: + :maxdepth: 2 + + version_control_inventory.rst + define_create_cluster.rst diff --git a/docs/source/advanced/xcat-inventory/version_control_inventory.rst b/docs/source/advanced/xcat-inventory/version_control_inventory.rst new file mode 100644 index 000000000..adc311e01 --- /dev/null +++ b/docs/source/advanced/xcat-inventory/version_control_inventory.rst @@ -0,0 +1,50 @@ +Manage the xCAT Cluster Definition under Source Control +======================================================= + +The xCAT cluster inventory data, including global configuration and object definitions(node/osimage/passwd/policy/network/router), and the relationship of the objects, can be exported to a YAML/JSON file(**inventory file**) from xCAT Database, or be imported to xCAT Database from the inventory file. + +By managing the inventory file under source control system, you can manage the xCAT cluster definition under source control. This section presents a typical step-by-step scenario on how to manage cluster inventory data under ``git``. + + +1. create a directory ``/git/cluster`` under git directory to hold the cluster inventory :: + + mkdir -p /git/cluster + cd /git/cluster + git init + +2. export the current cluster configuration to a inventory file "mycluster.yaml" under the git directory created above :: + + xcat-inventory export --format=yaml >/git/cluster/mycluster.yaml + +3. check diff and commit the cluster inventory file(commit no: c95673) :: + + cd /git/cluster + git diff + git add /git/cluster/mycluster.yaml + git commit /git/cluster/mycluster.yaml -m "$(date "+%Y_%m_%d_%H_%M_%S"): initial cluster inventory data; blah-blah" + +4. ordinary cluster maintenance and operation: replaced bad nodes, turn on xcatdebugmode... + +5. cluster setup is stable now, export and commit the cluster configuration(commit no: c95673) :: + + xcat-inventory export --format=yaml >/git/cluster/mycluster.yaml + cd /git/cluster + git diff + git add xcat-inventory export --format=yaml >/git/cluster/mycluster.yaml + git commit /git/cluster/mycluster.yaml -m "$(date "+%Y_%m_%d_%H_%M_%S"): replaced bad nodes; turn on xcatdebugmode; blah-blah" + +6. ordinary cluster maintenance and operation, some issues are founded in current cluster, need to restore the current cluster configuration to commit no c95673 [1]_ :: + + cd /git/cluster + git checkout c95673 + xcat-inventory import -f /git/cluster/mycluster.yaml + +*Notice:* + +1. The cluster inventory data exported by ``xcat-inventory`` does not include intermidiate data, transiate data and historical data in xCAT DataBase, such as node status, auditlog table + +2. We suggest you backup your xCAT database by ``dumpxCATdb`` before your trial on this feature, although we have run sufficient test on this + +.. [1] When you import the inventory data to xCAT Database in step 6, there are 2 modes: ``clean mode`` and ``update mode``. If you choose the ``clean mode`` by ``xcat-inventory import -c|--clean``, all the objects definitions that are not included in the inventory file will be removed; Otherwise, only the objects included in the inventory file will be updated or inserted. Please choose the proper mode according to your need + + From feaa1532ecc1d50d4a530bbbe1c6c808465b85ea Mon Sep 17 00:00:00 2001 From: xuweibj Date: Fri, 9 Mar 2018 18:30:46 +0800 Subject: [PATCH 15/21] Not start agent when no valid nodes (#4915) --- xCAT-server/lib/xcat/plugins/openbmc2.pm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/openbmc2.pm b/xCAT-server/lib/xcat/plugins/openbmc2.pm index 1a3cac6e6..f4c750777 100644 --- a/xCAT-server/lib/xcat/plugins/openbmc2.pm +++ b/xCAT-server/lib/xcat/plugins/openbmc2.pm @@ -121,12 +121,6 @@ sub process_request { xCAT::MsgUtils->message("E", { data => ["The xCAT Python agent does not exist. Check if xCAT-openbmc-py package is installed on management node and service nodes."] }, $callback); return; } - # If we can't start the python agent, exit immediately - my $pid = xCAT::OPENBMC::start_python_agent(); - if (!defined($pid)) { - xCAT::MsgUtils->message("E", { data => ["Failed to start the xCAT Python agent. Check /var/log/xcat/cluster.log for more information."] }, $callback); - return; - } my $noderange = $request->{node}; my $check = parse_node_info($noderange); @@ -137,6 +131,13 @@ sub process_request { $callback->({ errorcode => [$check] }) if ($check); return unless(%node_info); + # If we can't start the python agent, exit immediately + my $pid = xCAT::OPENBMC::start_python_agent(); + if (!defined($pid)) { + xCAT::MsgUtils->message("E", { data => ["Failed to start the xCAT Python agent. Check /var/log/xcat/cluster.log for more information."] }, $callback); + return; + } + xCAT::OPENBMC::submit_agent_request($pid, $request, \%node_info, $callback); xCAT::OPENBMC::wait_agent($pid, $callback); } From 3e8387a5c28cf6fd61f1ef86b784169a1e67fd44 Mon Sep 17 00:00:00 2001 From: Victor Hu Date: Fri, 9 Mar 2018 16:17:58 -0500 Subject: [PATCH 16/21] Add performance graph for Python/Perl comparism, for rpower <> state --- .../scalability/python/images/rpower_state.png | Bin 0 -> 25711 bytes .../scalability/python/performance.rst | 9 ++++++++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 docs/source/references/coral/cluster_mgmt/scalability/python/images/rpower_state.png diff --git a/docs/source/references/coral/cluster_mgmt/scalability/python/images/rpower_state.png b/docs/source/references/coral/cluster_mgmt/scalability/python/images/rpower_state.png new file mode 100644 index 0000000000000000000000000000000000000000..136840281a1dca18056f2476e82db11b4e5b96bb GIT binary patch literal 25711 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 state +```````````````````````` + +This chart gathers data points on a single 18-node frame, up to 4 frames (72-nodes). + +.. image:: images/rpower_state.png From 1d7e0a0042536d8de7ad5eb554789398b5874860 Mon Sep 17 00:00:00 2001 From: Bin Xu Date: Mon, 12 Mar 2018 14:47:04 +0800 Subject: [PATCH 17/21] Support mutiple commands in the same time - Using PID tailing name to avoid the lock --- xCAT-openbmc-py/lib/python/agent/agent.py | 8 +++++- .../lib/python/agent/xcatagent/server.py | 9 +++--- xCAT-server/lib/perl/xCAT/OPENBMC.pm | 28 +++++++++++++------ 3 files changed, 31 insertions(+), 14 deletions(-) diff --git a/xCAT-openbmc-py/lib/python/agent/agent.py b/xCAT-openbmc-py/lib/python/agent/agent.py index b7a1827bc..6afdefea8 100755 --- a/xCAT-openbmc-py/lib/python/agent/agent.py +++ b/xCAT-openbmc-py/lib/python/agent/agent.py @@ -26,6 +26,11 @@ class AgentShell(object): "with the client", default='/var/run/xcat/agent.sock', type=str) + parser.add_argument('--lockfile', + help="The lock file to communicate " + "with the xcat", + default='/var/lock/xcat/agent.lock', + type=str) return parser def do_help(self, args): @@ -38,7 +43,8 @@ class AgentShell(object): if options.help: self.do_help(options) return 0 - s = server.Server(options.sock, options.standalone) + + s = server.Server(options.sock, options.standalone, options.lockfile) s.start() class HelpFormatter(argparse.HelpFormatter): diff --git a/xCAT-openbmc-py/lib/python/agent/xcatagent/server.py b/xCAT-openbmc-py/lib/python/agent/xcatagent/server.py index ac55601a1..56b234f2b 100644 --- a/xCAT-openbmc-py/lib/python/agent/xcatagent/server.py +++ b/xCAT-openbmc-py/lib/python/agent/xcatagent/server.py @@ -14,7 +14,7 @@ from xcatagent import base as xcat_manager MSG_TYPE = 'message' DB_TYPE = 'db' -LOCK_FILE = '/var/lock/xcat/agent.lock' +#LOCK_FILE = '/var/lock/xcat/agent.lock' class XCATMessager(utils.Messager): @@ -50,7 +50,7 @@ class XCATMessager(utils.Messager): class Server(object): - def __init__(self, address, standalone): + def __init__(self, address, standalone=True, lockfile=None): try: os.unlink(address) except OSError: @@ -58,6 +58,7 @@ class Server(object): raise self.address = address self.standalone = standalone + self.lockfile = lockfile self.server = StreamServer(self._serve(), self._handle) def _serve(self): @@ -117,7 +118,7 @@ class Server(object): def keep_peer_alive(self): def acquire(): - fd = open(LOCK_FILE, "r+") + fd = open(self.lockfile, "r+") fcntl.flock(fd.fileno(), fcntl.LOCK_EX) # if reach here, parent process may exit print("xcat process exit unexpectedly.", file=sys.stderr) @@ -128,6 +129,6 @@ class Server(object): t.start() def start(self): - if not self.standalone: + if not self.standalone and self.lockfile: self.keep_peer_alive() self.server.serve_forever() diff --git a/xCAT-server/lib/perl/xCAT/OPENBMC.pm b/xCAT-server/lib/perl/xCAT/OPENBMC.pm index 2cecf635f..c21fd1f8c 100644 --- a/xCAT-server/lib/perl/xCAT/OPENBMC.pm +++ b/xCAT-server/lib/perl/xCAT/OPENBMC.pm @@ -64,10 +64,10 @@ sub send_request { sub acquire_lock { mkpath($LOCK_DIR); # always create a new lock file - unlink($LOCK_PATH); - open($lock_fd, ">>", $LOCK_PATH) or return undef; + unlink($LOCK_PATH . $$); + open($lock_fd, ">>", $LOCK_PATH . $$) or return undef; flock($lock_fd, LOCK_EX) or return undef; - return $lock_fd; + return $LOCK_PATH . $$; } sub exists_python_agent { @@ -78,30 +78,38 @@ sub exists_python_agent { } sub start_python_agent { - if (!defined(acquire_lock())) { + my $lockfile = acquire_lock(); + if (!defined($lockfile)) { xCAT::MsgUtils->message("S", "start_python_agent() Error: Failed to acquire lock"); return undef; } + my $fd; - open($fd, '>', $AGENT_SOCK_PATH) && close($fd); my $pid = fork; if (!defined $pid) { xCAT::MsgUtils->message("S", "start_python_agent() Error: Unable to fork process"); return undef; + } elsif ($pid){ + + open($fd, '>', $AGENT_SOCK_PATH . $pid) && close($fd); + return $pid; } + $SIG{CHLD} = 'DEFAULT'; if (!$pid) { + # child open($fd, ">>", $PYTHON_LOG_PATH) && close($fd); open(STDOUT, '>>', $PYTHON_LOG_PATH) or die("open: $!"); open(STDERR, '>>&', \*STDOUT) or die("open: $!"); - my $ret = exec ($PYTHON_AGENT_FILE); + my @args = ( "$PYTHON_AGENT_FILE --sock $AGENT_SOCK_PATH$$ --lockfile $lockfile" ); + my $ret = exec @args; if (!defined($ret)) { xCAT::MsgUtils->message("S", "start_python_agent() Error: Failed to start the xCAT Python agent."); exit(1); } } - return $pid; + } sub handle_message { @@ -131,7 +139,7 @@ sub submit_agent_request { my $sock; my $retry = 0; while($retry < 30) { - $sock = IO::Socket::UNIX->new(Peer => $AGENT_SOCK_PATH, Type => SOCK_STREAM, Timeout => 10, Blocking => 1); + $sock = IO::Socket::UNIX->new(Peer => $AGENT_SOCK_PATH . $pid, Type => SOCK_STREAM, Timeout => 10, Blocking => 1); if (!defined($sock)) { sleep(0.1); } else { @@ -140,7 +148,7 @@ sub submit_agent_request { $retry++; } if (!defined($sock)) { - xCAT::MsgUtils->message("E", { data => ["OpenBMC management is using a Python framework. An error has occurred when trying to create socket $AGENT_SOCK_PATH."] }, $callback); + xCAT::MsgUtils->message("E", { data => ["OpenBMC management is using a Python framework. An error has occurred when trying to create socket $AGENT_SOCK_PATH$pid."] }, $callback); kill('TERM', $pid); return; } @@ -201,6 +209,8 @@ sub wait_agent { xCAT::MsgUtils->message("E", { data => ["Agent exited unexpectedly. See $PYTHON_LOG_PATH for details."] }, $callback); xCAT::MsgUtils->message("I", { data => ["To revert to Perl framework: chdef -t site clustersite openbmcperl=ALL"] }, $callback); } + unlink($AGENT_SOCK_PATH . $pid); + unlink($LOCK_PATH . $$); } #-------------------------------------------------------------------------------- From 4ad99269fe797fff13bb32bbb4e00466f3cee628 Mon Sep 17 00:00:00 2001 From: yangsong Date: Mon, 12 Mar 2018 17:40:39 +0800 Subject: [PATCH 18/21] fix issue: genimage tries direct DB access instead of via xCATd #4385 (#4924) --- xCAT-client/bin/genimage | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/xCAT-client/bin/genimage b/xCAT-client/bin/genimage index 1030b7ae0..ec65eb7c9 100755 --- a/xCAT-client/bin/genimage +++ b/xCAT-client/bin/genimage @@ -116,7 +116,7 @@ if (@ARGV > 0) { } if ((!$imagename) && (!$profile) && (!$os) && (!$arch)) { - my $tmpimgs = `lsdef -t osimage -w provmethod=~'/statelite|netboot/' |cut -d' ' -f1`; + my $tmpimgs = `XCATXMLTRACE=0 XCATBYPASS=0 lsdef -t osimage -w provmethod=~'/statelite|netboot/' |cut -d' ' -f1`; if ($? == 0) { if (($tmpimgs) && ($tmpimgs !~ /^Could/)) { #Could is returned when the osimage table is empty my @images = split('\n', $tmpimgs); @@ -162,8 +162,7 @@ if ((!$imagename) && (!$profile) && (!$os) && (!$arch)) { # get the install directory -my @entries = xCAT::TableUtils->get_site_attribute("installdir"); -my $installdir = $entries[0]; +my $installdir = `XCATXMLTRACE=0 XCATBYPASS=0 lsdef -t site -o clustersite -i installdir|grep -w 'installdir'|cut -d= -f2`; chomp($installdir); # lots of error checking to make sure it exists. From f36e659715e9ae031407db379ba91a24b88c3909 Mon Sep 17 00:00:00 2001 From: bybai Date: Mon, 12 Mar 2018 23:10:24 -0400 Subject: [PATCH 19/21] enhance mlnxofed_ib_install.v2 return 1 when service openibd restart failed --- .../share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install.v2 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install.v2 b/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install.v2 index dc4df9918..cc1970044 100755 --- a/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install.v2 +++ b/xCAT-server/share/xcat/ib/scripts/Mellanox/mlnxofed_ib_install.v2 @@ -328,6 +328,10 @@ EOF #force openibd load all modules in need, restart again sleep 1 service openibd restart + if [ "$?" != "0" ] ;then + echo "[Error] service openibd restart failed." + exit 1 + fi fi if [[ "$NODESETSTATE" == "genimage" ]]; then From 06a3db57c8ed1261d90e04f7928b1af38b90f5cf Mon Sep 17 00:00:00 2001 From: yangsong Date: Tue, 13 Mar 2018 14:27:45 +0800 Subject: [PATCH 20/21] add template for openbmc controlled Power LE server (#4928) --- .../{ppc64le.stanza => ppc64le-ipmi.stanza} | 4 ++-- .../objects/node/ppc64le-openbmc.stanza | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) rename xCAT/templates/objects/node/{ppc64le.stanza => ppc64le-ipmi.stanza} (74%) create mode 100644 xCAT/templates/objects/node/ppc64le-openbmc.stanza diff --git a/xCAT/templates/objects/node/ppc64le.stanza b/xCAT/templates/objects/node/ppc64le-ipmi.stanza similarity index 74% rename from xCAT/templates/objects/node/ppc64le.stanza rename to xCAT/templates/objects/node/ppc64le-ipmi.stanza index f0a72bf23..3b134926d 100644 --- a/xCAT/templates/objects/node/ppc64le.stanza +++ b/xCAT/templates/objects/node/ppc64le-ipmi.stanza @@ -1,4 +1,4 @@ -# +# ppc64le-template: objtype=node @@ -15,4 +15,4 @@ ppc64le-template: nodetype=mp serialport=0 serialspeed=115200 - usercomment="the template for PowerLE NV node definition" + usercomment="the template for ipmi controlled PowerLE NV node definition" diff --git a/xCAT/templates/objects/node/ppc64le-openbmc.stanza b/xCAT/templates/objects/node/ppc64le-openbmc.stanza new file mode 100644 index 000000000..43af130a9 --- /dev/null +++ b/xCAT/templates/objects/node/ppc64le-openbmc.stanza @@ -0,0 +1,18 @@ +# + +ppc64le-openbmc-template: + objtype=node + arch=ppc64le + bmc="MANDATORY:The hostname or ip address of the BMC adapater" + bmcpassword="MANDATORY:the password of the BMC" + bmcusername="MANDATORY:the username of the BMC" + cons=openbmc + groups=all + ip=OPTIONAL:the ip address of the node + mac=OPTIONAL:the mac of the node + mgt=openbmc + netboot=petitboot + nodetype=mp + serialport=0 + serialspeed=115200 + usercomment="the template for openbmc controlled PowerLE NV node definition" From 387055a3be33da5b005c50b8ead4e1366269f93c Mon Sep 17 00:00:00 2001 From: Bin Xu Date: Tue, 13 Mar 2018 16:56:55 +0800 Subject: [PATCH 21/21] to address the review comments: - using signal to handle the cleanup --- .../lib/python/agent/xcatagent/server.py | 2 +- xCAT-server/lib/perl/xCAT/OPENBMC.pm | 30 ++++++++++--------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/xCAT-openbmc-py/lib/python/agent/xcatagent/server.py b/xCAT-openbmc-py/lib/python/agent/xcatagent/server.py index 56b234f2b..30f9d0f4d 100644 --- a/xCAT-openbmc-py/lib/python/agent/xcatagent/server.py +++ b/xCAT-openbmc-py/lib/python/agent/xcatagent/server.py @@ -129,6 +129,6 @@ class Server(object): t.start() def start(self): - if not self.standalone and self.lockfile: + if not self.standalone: self.keep_peer_alive() self.server.serve_forever() diff --git a/xCAT-server/lib/perl/xCAT/OPENBMC.pm b/xCAT-server/lib/perl/xCAT/OPENBMC.pm index c21fd1f8c..bc583ee87 100644 --- a/xCAT-server/lib/perl/xCAT/OPENBMC.pm +++ b/xCAT-server/lib/perl/xCAT/OPENBMC.pm @@ -25,8 +25,8 @@ use xCAT_monitoring::monitorctrl; use xCAT::TableUtils; my $LOCK_DIR = "/var/lock/xcat/"; -my $LOCK_PATH = "/var/lock/xcat/agent.lock"; -my $AGENT_SOCK_PATH = "/var/run/xcat/agent.sock"; +my $LOCK_PATH = "/var/lock/xcat/agent-$$.lock"; +my $AGENT_SOCK_PATH = "/var/run/xcat/agent-$$.sock"; my $PYTHON_LOG_PATH = "/var/log/xcat/agent.log"; my $PYTHON_AGENT_FILE = "/opt/xcat/lib/python/agent/agent.py"; my $MSG_TYPE = "message"; @@ -64,10 +64,10 @@ sub send_request { sub acquire_lock { mkpath($LOCK_DIR); # always create a new lock file - unlink($LOCK_PATH . $$); - open($lock_fd, ">>", $LOCK_PATH . $$) or return undef; + unlink($LOCK_PATH); + open($lock_fd, ">>", $LOCK_PATH) or return undef; flock($lock_fd, LOCK_EX) or return undef; - return $LOCK_PATH . $$; + return $lock_fd; } sub exists_python_agent { @@ -76,10 +76,13 @@ sub exists_python_agent { } return 0; } +sub python_agent_reaper { + unlink($LOCK_PATH); + unlink($AGENT_SOCK_PATH); +} sub start_python_agent { - my $lockfile = acquire_lock(); - if (!defined($lockfile)) { + if (!defined(acquire_lock())) { xCAT::MsgUtils->message("S", "start_python_agent() Error: Failed to acquire lock"); return undef; } @@ -91,18 +94,18 @@ sub start_python_agent { return undef; } elsif ($pid){ - open($fd, '>', $AGENT_SOCK_PATH . $pid) && close($fd); + open($fd, '>', $AGENT_SOCK_PATH) && close($fd); + $SIG{INT} = $SIG{TERM} = \&python_agent_reaper; return $pid; } $SIG{CHLD} = 'DEFAULT'; if (!$pid) { - # child open($fd, ">>", $PYTHON_LOG_PATH) && close($fd); open(STDOUT, '>>', $PYTHON_LOG_PATH) or die("open: $!"); open(STDERR, '>>&', \*STDOUT) or die("open: $!"); - my @args = ( "$PYTHON_AGENT_FILE --sock $AGENT_SOCK_PATH$$ --lockfile $lockfile" ); + my @args = ( "$PYTHON_AGENT_FILE --sock $AGENT_SOCK_PATH --lockfile $LOCK_PATH" ); my $ret = exec @args; if (!defined($ret)) { xCAT::MsgUtils->message("S", "start_python_agent() Error: Failed to start the xCAT Python agent."); @@ -139,7 +142,7 @@ sub submit_agent_request { my $sock; my $retry = 0; while($retry < 30) { - $sock = IO::Socket::UNIX->new(Peer => $AGENT_SOCK_PATH . $pid, Type => SOCK_STREAM, Timeout => 10, Blocking => 1); + $sock = IO::Socket::UNIX->new(Peer => $AGENT_SOCK_PATH, Type => SOCK_STREAM, Timeout => 10, Blocking => 1); if (!defined($sock)) { sleep(0.1); } else { @@ -148,7 +151,7 @@ sub submit_agent_request { $retry++; } if (!defined($sock)) { - xCAT::MsgUtils->message("E", { data => ["OpenBMC management is using a Python framework. An error has occurred when trying to create socket $AGENT_SOCK_PATH$pid."] }, $callback); + xCAT::MsgUtils->message("E", { data => ["OpenBMC management is using a Python framework. An error has occurred when trying to create socket $AGENT_SOCK_PATH."] }, $callback); kill('TERM', $pid); return; } @@ -209,8 +212,7 @@ sub wait_agent { xCAT::MsgUtils->message("E", { data => ["Agent exited unexpectedly. See $PYTHON_LOG_PATH for details."] }, $callback); xCAT::MsgUtils->message("I", { data => ["To revert to Perl framework: chdef -t site clustersite openbmcperl=ALL"] }, $callback); } - unlink($AGENT_SOCK_PATH . $pid); - unlink($LOCK_PATH . $$); + python_agent_reaper(); } #--------------------------------------------------------------------------------