Skip to content

Commit 6d3dffc

Browse files
authored
Merge pull request ceph#64591 from tchaikov/wip-auth-remove-unused
auth: remove unused AuthTicket::renew_after member variable Reviewed-by: Ilya Dryomov <[email protected]>
2 parents 8f62e8f + 928aa98 commit 6d3dffc

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

doc/dev/cephx.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ where::
163163
AuthTicket {
164164
EntityName name # client's identity, as proven by its possession of principal_secret
165165
u64 global_id # newly assigned, or from old_ticket
166-
utime_t created, renew_after, expires
166+
utime_t created, expires
167167
AuthCapsInfo # what client is allowed to do
168168
u32 flags = 0 # unused
169169
}
@@ -258,7 +258,7 @@ Where, as above,::
258258
AuthTicket {
259259
EntityName name
260260
u64 global_id
261-
utime_t created, renew_after, expires
261+
utime_t created, expires
262262
AuthCapsInfo # what you are allowed to do
263263
u32 flags = 0 # unused
264264
}

src/auth/Auth.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ WRITE_CLASS_ENCODER(AuthCapsInfo)
136136
struct AuthTicket {
137137
EntityName name;
138138
uint64_t global_id; /* global instance id */
139-
utime_t created, renew_after, expires;
139+
utime_t created, expires;
140140
AuthCapsInfo caps;
141141
__u32 flags;
142142

@@ -146,8 +146,6 @@ struct AuthTicket {
146146
created = now;
147147
expires = now;
148148
expires += ttl;
149-
renew_after = now;
150-
renew_after += ttl / 2.0;
151149
}
152150

153151
void encode(ceph::buffer::list& bl) const {
@@ -181,7 +179,6 @@ struct AuthTicket {
181179
f->dump_object("name", name);
182180
f->dump_unsigned("global_id", global_id);
183181
f->dump_stream("created") << created;
184-
f->dump_stream("renew_after") << renew_after;
185182
f->dump_stream("expires") << expires;
186183
f->dump_object("caps", caps);
187184
f->dump_unsigned("flags", flags);

0 commit comments

Comments
 (0)