From: Victor Denisov <denisovenator@gmail.com>
Date: Mon, 18 Dec 2017 01:05:07 +0000 (-0800)
Subject: librbd: rename group state to 'incomplete'
X-Git-Tag: wip-pdonnell-testing-20180317.202121~588^2~32
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=74908f4bc1e763ad48852251422d51319d09b17e;p=ceph-ci.git

librbd: rename group state to 'incomplete'

Signed-off-by: Victor Denisov <denisovenator@gmail.com>
---

diff --git a/src/include/rbd/librbd.h b/src/include/rbd/librbd.h
index ba8ea29b7d7..8a5918b00ce 100644
--- a/src/include/rbd/librbd.h
+++ b/src/include/rbd/librbd.h
@@ -170,7 +170,7 @@ typedef struct {
 } rbd_group_spec_t;
 
 typedef enum {
-  GROUP_SNAP_STATE_PENDING,
+  GROUP_SNAP_STATE_INCOMPLETE,
   GROUP_SNAP_STATE_COMPLETE
 } rbd_group_snap_state_t;
 
diff --git a/src/pybind/rbd/rbd.pyx b/src/pybind/rbd/rbd.pyx
index 16c9b50ba91..d8e07c78f93 100644
--- a/src/pybind/rbd/rbd.pyx
+++ b/src/pybind/rbd/rbd.pyx
@@ -177,7 +177,7 @@ cdef extern from "rbd/librbd.h" nogil:
         rbd_group_image_state_t state
 
     ctypedef enum rbd_group_snap_state_t:
-        _GROUP_SNAP_STATE_PENDING "GROUP_SNAP_STATE_PENDING"
+        _GROUP_SNAP_STATE_INCOMPLETE "GROUP_SNAP_STATE_INCOMPLETE"
         _GROUP_SNAP_STATE_COMPLETE "GROUP_SNAP_STATE_COMPLETE"
 
     ctypedef struct rbd_group_snap_spec_t:
diff --git a/src/tools/rbd/action/Group.cc b/src/tools/rbd/action/Group.cc
index c96bcdd48e4..8d557f23cea 100644
--- a/src/tools/rbd/action/Group.cc
+++ b/src/tools/rbd/action/Group.cc
@@ -451,8 +451,8 @@ int execute_group_snap_list(const po::variables_map &vm) {
     std::string snap_name = i.name;
     int state = i.state;
     std::string state_string;
-    if (GROUP_SNAP_STATE_PENDING == state) {
-      state_string = "pending";
+    if (GROUP_SNAP_STATE_INCOMPLETE == state) {
+      state_string = "incomplete";
     } else {
       state_string = "ok";
     }