Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / phosphor-time-manager / 1cd4248d4afa664b94411dd57e7e686f944dfafc
commit1cd4248d4afa664b94411dd57e7e686f944dfafc[log] [tgz]
authorLei YU <mine260309@gmail.com>Tue Jul 24 10:40:59 2018 +0800
committerLei YU <mine260309@gmail.com>Wed Sep 12 10:45:04 2018 +0800
treeb49f3d0aa6c319b263b1134e329cd4f4ee65d3e6
parent89efe6ed27a9df5a8e761073bdadd3fdd3fa5875 [diff]
Fix un-initialized time owner/mode in manager

The timeOwner/Mode in Manager class has no init value, and it is
initialized with the cached time owner/mode in file system.

In most of time it is OK because there is cached time owner/mode.
But if the BMC does a factory reset, the cached values are cleaned up,
and in next reboot the timeOwner/Mode will not be initialized at all.

The fix is to give default time owner/mode, so when BMC comes from
factory reset it uses default time settings.

Tested: Verify the timeOwner/Mode have correct init values after factory
        reset.

Change-Id: Ib1a8fba4d758f33ed09a7afdc9ed684867fca1c5
3 files changed
tree: b49f3d0aa6c319b263b1134e329cd4f4ee65d3e6
  1. test/
  2. .gitignore
  3. bmc_epoch.cpp
  4. bmc_epoch.hpp
  5. bmc_time_change_listener.hpp
  6. bootstrap.sh
  7. configure.ac
  8. epoch_base.cpp
  9. epoch_base.hpp
  10. host_epoch.cpp
  11. host_epoch.hpp
  12. LICENSE
  13. main.cpp
  14. MAINTAINERS
  15. Makefile.am
  16. manager.cpp
  17. manager.hpp
  18. property_change_listener.hpp
  19. README.md
  20. settings.cpp
  21. settings.hpp
  22. types.hpp
  23. utils.cpp
  24. utils.hpp
README.md

Introduction

phosphor-time-manager is the time manager service that implements D-Bus interface xyz/openbmc_project/Time/EpochTime.interface.yaml. The user can get or set the BMC's or HOST's time via this interface.

General usage

The service xyz.openbmc_project.Time.Manager provides two objects on D-Bus:

  • /xyz/openbmc_project/time/bmc
  • /xyz/openbmc_project/time/host

where each object implements interface xyz.openbmc_project.Time.EpochTime.

The user can directly get or set the property Elapsed of the objects to get or set the time. For example on an authenticated session:

  • To get BMC's time:
    ### With busctl on BMC
busctl get-property xyz.openbmc_project.Time.Manager \
    /xyz/openbmc_project/time/bmc xyz.openbmc_project.Time.EpochTime Elapsed

### With REST API on remote host
curl -b cjar -k https://${BMC_IP}/xyz/openbmc_project/time/bmc
  • To set HOST's time:
    ### With busctl on BMC
busctl set-property xyz.openbmc_project.Time.Manager \
    /xyz/openbmc_project/time/host xyz.openbmc_project.Time.EpochTime \
    Elapsed t <value-in-microseconds>

### With REST API on remote host
curl -b cjar -k -H "Content-Type: application/json" -X PUT \
    -d '{"data": 1487304700000000}' \
    https://${BMC_IP}/xyz/openbmc_project/time/host/attr/Elapsed

Time settings

Getting BMC or HOST time is always allowed, but setting the time may not be allowed depending on the below two settings in the settings manager.

  • TimeSyncMethod
    • NTP: The time is set via NTP server.
    • MANUAL: The time is set manually.
  • TimeOwner
    • BMC: BMC owns the time and can set the time.
    • HOST: Host owns the time and can set the time.
    • SPLIT: BMC and Host own separate time.
    • BOTH: Both BMC and Host can set the time.

A summary of which cases the time can be set on BMC or HOST:

ModeOwnerSet BMC TimeSet Host Time
NTPBMCFail to setNot allowed
NTPHOSTNot allowedNot allowed
NTPSPLITFail to setOK
NTPBOTHFail to setNot allowed
MANUALBMCOKNot allowed
MANUALHOSTNot allowedOK
MANUALSPLITOKOK
MANUALBOTHOKOK

  • To set an NTP server:

    ### With busctl on BMC
busctl set-property  xyz.openbmc_project.Network \
   /xyz/openbmc_project/network/eth0 \
   xyz.openbmc_project.Network.EthernetInterface NTPServers \
   as 1 "<ntp_server>"

### With REST API on remote host
curl -c cjar -b cjar -k -H "Content-Type: application/json" -X  PUT  -d \
    '{"data": ["<ntp_server>"] }' \
    https://${BMC_IP}/xyz/openbmc_project/network/eth0/attr/NTPServers

  • To go into NTP mode

    ### With busctl on BMC
busctl set-property xyz.openbmc_project.Settings \
    /xyz/openbmc_project/time/sync_method xyz.openbmc_project.Time.Synchronization \
    TimeSyncMethod s "xyz.openbmc_project.Time.Synchronization.Method.NTP"

### With REST API on remote host
curl -c cjar -b cjar -k -H "Content-Type: application/json" -X  PUT  -d \
    '{"data": "xyz.openbmc_project.Time.Synchronization.Method.NTP" }' \
    https://${BMC_IP}/xyz/openbmc_project/time/sync_method/attr/TimeSyncMethod

  • To change owner

    ### With busctl on BMC
busctl set-property xyz.openbmc_project.Settings \
    /xyz/openbmc_project/time/owner xyz.openbmc_project.Time.Owner \
    TimeOwner s xyz.openbmc_project.Time.Owner.Owners.BMC

### With REST API on remote host
curl -c cjar -b cjar -k -H "Content-Type: application/json" -X  PUT  -d \
    '{"data": "xyz.openbmc_project.Time.Owner.Owners.BMC" }' \
    https://${BMC_IP}/xyz/openbmc_project/time/owner/attr/TimeOwner

Special note on host on

When the host is on, the changes of the above time mode/owner are not applied but deferred. The changes of the mode/owner are saved to persistent storage.

When the host is off, the saved mode/owner are read from persistent storage and are applied.

Note: A user can set the time mode and owner in the settings daemon at any time, but the time manager applying them is governed by the above condition.