Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add ObjWaitExtend2() to provide a consistent boc state #4109

Merged
merged 1 commit into from
May 27, 2024
Merged

Add ObjWaitExtend2() to provide a consistent boc state #4109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions bin/varnishd/cache/cache_obj.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,8 +265,10 @@ ObjExtend(struct worker *wrk, struct objcore *oc, ssize_t l, int final)
*/

uint64_t
ObjWaitExtend(const struct worker *wrk, const struct objcore *oc, uint64_t l)
ObjWaitExtend(const struct worker *wrk, const struct objcore *oc, uint64_t l,
enum boc_state_e *statep)
{
enum boc_state_e state;
uint64_t rv;

CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
Expand All @@ -282,15 +284,16 @@ ObjWaitExtend(const struct worker *wrk, const struct objcore *oc, uint64_t l)
oc->boc->delivered_so_far = l;
PTOK(pthread_cond_signal(&oc->boc->cond));
}
if (rv > l || oc->boc->state >= BOS_FINISHED)
state = oc->boc->state;
if (rv > l || state >= BOS_FINISHED)
break;
(void)Lck_CondWait(&oc->boc->cond, &oc->boc->mtx);
}
rv = oc->boc->fetched_so_far;
Lck_Unlock(&oc->boc->mtx);
if (statep != NULL)
*statep = state;
return (rv);
}

/*====================================================================
*/

Expand Down
2 changes: 1 addition & 1 deletion bin/varnishd/cache/cache_varnishd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ void ObjDestroy(const struct worker *, struct objcore **);
int ObjGetSpace(struct worker *, struct objcore *, ssize_t *sz, uint8_t **ptr);
void ObjExtend(struct worker *, struct objcore *, ssize_t l, int final);
uint64_t ObjWaitExtend(const struct worker *, const struct objcore *,
uint64_t l);
uint64_t l, enum boc_state_e *statep);
void ObjSetState(struct worker *, const struct objcore *,
enum boc_state_e next);
void ObjWaitState(const struct objcore *, enum boc_state_e want);
Expand Down
18 changes: 5 additions & 13 deletions bin/varnishd/storage/storage_simple.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,23 +362,16 @@ sml_iterator(struct worker *wrk, struct objcore *oc,
}
while (1) {
ol = len;
nl = ObjWaitExtend(wrk, oc, ol);
if (boc->state == BOS_FAILED) {
nl = ObjWaitExtend(wrk, oc, ol, &state);
if (state == BOS_FAILED) {
ret = -1;
break;
}
if (nl == ol) {
/*
* note: the unguarded boc->state read could be
* outdated, in which case we call ObjWaitExtend() again
* for error handling but otherwise cause no harm. When
* using this code as an example, DO NOT rely on
* boc->state to be consistent
*/
if (boc->state == BOS_FINISHED)
break;
continue;
assert(state == BOS_FINISHED);
break;
}
assert(nl > ol);
Lck_Lock(&boc->mtx);
AZ(VTAILQ_EMPTY(&obj->list));
if (checkpoint == NULL) {
Expand Down Expand Up @@ -417,7 +410,6 @@ sml_iterator(struct worker *wrk, struct objcore *oc,
st = VTAILQ_PREV(st, storagehead, list);
if (st != NULL && st->len == 0)
st = NULL;
state = boc->state;
Lck_Unlock(&boc->mtx);
assert(l > 0 || state == BOS_FINISHED);
u = 0;
Expand Down
5 changes: 5 additions & 0 deletions doc/changes.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@ Varnish Cache NEXT (2024-09-15)
.. PLEASE keep this roughly in commit order as shown by git-log / tig
(new to old)

* The ObjWaitExtend() Object API function gained a ``statep`` argument
to optionally return the busy object state consistent with the
current extension. A ``NULL`` value may be passed if the caller does
not require it.

* for backends using the ``.via`` attribute to connect through a
*proxy*, the ``connect_timeout``, ``first_byte_timeout`` and
``between_bytes_timeout`` attributes are now inherited from *proxy*
Expand Down
4 changes: 3 additions & 1 deletion include/vrt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@

#define VRT_MAJOR_VERSION 19U

#define VRT_MINOR_VERSION 0U
#define VRT_MINOR_VERSION 1U

/***********************************************************************
* Major and minor VRT API versions.
Expand All @@ -58,6 +58,8 @@
* binary/load-time compatible, increment MAJOR version
*
* NEXT (2024-09-15)
* 19.1 (2024-05-27)
* [cache_varnishd.h] ObjWaitExtend() gained statep argument
* 19.0 (2024-03-18)
* [cache.h] (struct req).filter_list renamed to vdp_filter_list
* order of vcl/vmod and director COLD events reversed to directors first
Expand Down