]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
librbd: make group and group snapshot IDs more random 57092/head
authorIlya Dryomov <idryomov@gmail.com>
Wed, 17 Apr 2024 18:31:02 +0000 (20:31 +0200)
committerIlya Dryomov <idryomov@gmail.com>
Thu, 25 Apr 2024 11:54:29 +0000 (13:54 +0200)
commite5eb925f484c872e4bf02a73b569a4b83624ef7c
treea9adb5832b7e966ba6d93a2347161a4c065f1150
parentb22e2ebdeb24376882b7bda2a7329c8cccc2276a
librbd: make group and group snapshot IDs more random

Image IDs suffered from the same issue -- it was addressed in commit
be8373688c1b ("librbd: block_name_prefix is not created randomly").
The code for generating group IDs is duplicated in api/Group.cc and
got missed.

Instead of cut-and-pasting the fix, just call generate_image_id()
directly and rename variables for more explicitness.

Before:

  $ rados -p rbd ls | grep rbd_group_header
  rbd_group_header.10256b8b4567
  rbd_group_header.10216b8b4567
  rbd_group_header.10236b8b4567
  rbd_group_header.101f6b8b4567

After:

  $ rados -p rbd ls | grep rbd_group_header
  rbd_group_header.10255f555a5
  rbd_group_header.1023f347eafb
  rbd_group_header.101f24c75111
  rbd_group_header.1021dda4e122

Fixes: https://tracker.ceph.com/issues/65573
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 76ed07d2d8085b733f51540154cfaf917db05e86)
src/librbd/Utils.cc
src/librbd/api/Group.cc