]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
librbd: make group and group snapshot IDs more random 56987/head
authorIlya Dryomov <idryomov@gmail.com>
Wed, 17 Apr 2024 18:31:02 +0000 (20:31 +0200)
committerIlya Dryomov <idryomov@gmail.com>
Thu, 18 Apr 2024 17:13:42 +0000 (19:13 +0200)
commit76ed07d2d8085b733f51540154cfaf917db05e86
tree1fb0a94fa54dad5af411f15aa2bc74874b86c13b
parenta6549451253d26216d353246c0fe6f6d80f3b9cf
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>
src/librbd/Utils.cc
src/librbd/api/Group.cc