From: Sage Weil <sage@redhat.com>
Date: Wed, 22 Jan 2020 21:51:49 +0000 (-0600)
Subject: cls_hello: alias write_return_data -> writes_dont_return_data
X-Git-Tag: v15.1.0~57^2~6
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=10ffeef1fb5b768f84eab236baee6451b758aac6;p=ceph-ci.git

cls_hello: alias write_return_data -> writes_dont_return_data

This allows pre-octopus tests to reach this (renamed) method via the old
method name.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/cls/hello/cls_hello.cc b/src/cls/hello/cls_hello.cc
index c301b96a301..71546d6858b 100644
--- a/src/cls/hello/cls_hello.cc
+++ b/src/cls/hello/cls_hello.cc
@@ -183,7 +183,6 @@ static int write_too_much_return_data(cls_method_context_t hctx, bufferlist *in,
   return 42;
 }
 
-
 /**
  * replay - a "read" method to get a previously recorded hello
  *
@@ -317,6 +316,7 @@ CLS_INIT(hello)
   cls_method_handle_t h_record_hello;
   cls_method_handle_t h_replay;
   cls_method_handle_t h_write_return_data;
+  cls_method_handle_t h_writes_dont_return_data;
   cls_method_handle_t h_write_too_much_return_data;
   cls_method_handle_t h_turn_it_to_11;
   cls_method_handle_t h_bad_reader;
@@ -342,6 +342,10 @@ CLS_INIT(hello)
   cls_register_cxx_method(h_class, "write_return_data",
 			  CLS_METHOD_WR,
 			  write_return_data, &h_write_return_data);
+  // legacy alias for this method for pre-octopus clients
+  cls_register_cxx_method(h_class, "writes_dont_return_data",
+			  CLS_METHOD_WR,
+			  write_return_data, &h_write_return_data);
   cls_register_cxx_method(h_class, "write_too_much_return_data",
 			  CLS_METHOD_WR,
 			  write_too_much_return_data, &h_write_too_much_return_data);