Failed to run gnocchi-upgrade with file backend

Attempt to create 'legacy' resources for ceilometer failed:

gnocchi-upgrade --debug --create-legacy-resource-types -v
Option "verbose" from group "DEFAULT" is deprecated for removal. Its value may be silently ignored in the future.
Exception in thread heartbeat:
Traceback (most recent call last):
  File "/usr/lib64/python2.7/threading.py", line 811, in __bootstrap_inner
    self.run()
  File "/usr/lib64/python2.7/threading.py", line 764, in run
    self.__target(*self.__args, **self.__kwargs)
  File "/usr/lib/python2.7/site-packages/gnocchi/storage/_carbonara.py", line 77, in _heartbeat
    while not self._stop_heartbeat.is_set():
AttributeError: 'FileStorage' object has no attribute '_stop_heartbeat'

Packages:
---------
python-gnocchiclient-2.2.0-1.el7ost.noarch
openstack-gnocchi-common-2.1.1-1.el7ost.noarch
openstack-gnocchi-statsd-2.1.1-1.el7ost.noarch
python-gnocchi-2.1.1-1.el7ost.noarch
openstack-gnocchi-metricd-2.1.1-1.el7ost.noarch
openstack-gnocchi-indexer-sqlalchemy-2.1.1-1.el7ost.noarch
openstack-gnocchi-api-2.1.1-1.el7ost.noarch
openstack-gnocchi-carbonara-2.1.1-1.el7ost.noarch

---
Regards,
Yurii