<p>Joshua Colp <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/10023">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Richard Mudgett: Looks good to me, but someone else must approve
Kevin Harwell: Looks good to me, but someone else must approve
Joshua Colp: Looks good to me, approved; Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">stasis_cache: Prune stasis_subscription_change messages<br><br>The stasis cache provides a way to reconstruct the current state<br>of topic subscribers. Unfortunately, since every subscribe and<br>unsubscribe is cached, the cache continues to grow unabated while<br>asterisk is running. This patch removes subscribe messages from<br>the cache when the corresponding unsubscribe is received.<br><br>This patch also registers the cache containers with ao2 so that if<br>AO2_DEBUG is turned on, you can list the container and get its<br>stats from the CLI.<br><br>ASTERISK-27121<br><br>Change-Id: I3d18905e477f3721815da91f30da8d3fbb2d4f56<br>---<br>M main/stasis_cache.c<br>1 file changed, 49 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/main/stasis_cache.c b/main/stasis_cache.c</span><br><span>index a34e9be..3e2ab17 100644</span><br><span>--- a/main/stasis_cache.c</span><br><span>+++ b/main/stasis_cache.c</span><br><span>@@ -50,6 +50,7 @@</span><br><span> snapshot_get_id id_fn;</span><br><span> cache_aggregate_calc_fn aggregate_calc_fn;</span><br><span> cache_aggregate_publish_fn aggregate_publish_fn;</span><br><span style="color: hsl(120, 100%, 40%);">+ int registered;</span><br><span> };</span><br><span> </span><br><span> /*! \internal */</span><br><span>@@ -71,6 +72,8 @@</span><br><span> * be bad. */</span><br><span> ast_assert(stasis_subscription_is_done(caching_topic->sub));</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ ao2_container_unregister(stasis_topic_name(caching_topic->topic));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> ao2_cleanup(caching_topic->sub);</span><br><span> caching_topic->sub = NULL;</span><br><span> ao2_cleanup(caching_topic->cache);</span><br><span>@@ -815,7 +818,31 @@</span><br><span> }</span><br><span> </span><br><span> msg_type = stasis_message_type(message);</span><br><span style="color: hsl(0, 100%, 40%);">- if (stasis_cache_clear_type() == msg_type) {</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (stasis_subscription_change_type() == msg_type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct stasis_subscription_change *change = stasis_message_data(message);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /*</span><br><span style="color: hsl(120, 100%, 40%);">+ * If this change type is an unsubscribe, we need to find the original</span><br><span style="color: hsl(120, 100%, 40%);">+ * subscribe and remove it from the cache otherwise the cache will</span><br><span style="color: hsl(120, 100%, 40%);">+ * continue to grow unabated.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strcmp(change->description, "Unsubscribe") == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct stasis_cache_entry *sub;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ao2_wrlock(caching_topic->cache->entries);</span><br><span style="color: hsl(120, 100%, 40%);">+ sub = cache_find(caching_topic->cache->entries, stasis_subscription_change_type(), change->uniqueid);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (sub) {</span><br><span style="color: hsl(120, 100%, 40%);">+ cache_remove(caching_topic->cache->entries, sub, stasis_message_eid(message));</span><br><span style="color: hsl(120, 100%, 40%);">+ ao2_cleanup(sub);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ ao2_unlock(caching_topic->cache->entries);</span><br><span style="color: hsl(120, 100%, 40%);">+ ao2_cleanup(caching_topic_needs_unref);</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ msg_put = message;</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = message;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (stasis_cache_clear_type() == msg_type) {</span><br><span> /* Cache clear event. */</span><br><span> msg_put = NULL;</span><br><span> msg = stasis_message_data(message);</span><br><span>@@ -868,6 +895,17 @@</span><br><span> ao2_cleanup(caching_topic_needs_unref);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void print_cache_entry(void *v_obj, void *where, ao2_prnt_fn *prnt)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct stasis_cache_entry *entry = v_obj;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ prnt(where, "Type: %s ID: %s Hash: %u", stasis_message_type_name(entry->key.type),</span><br><span style="color: hsl(120, 100%, 40%);">+ entry->key.id, entry->key.hash);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct stasis_caching_topic *stasis_caching_topic_create(struct stasis_topic *original_topic, struct stasis_cache *cache)</span><br><span> {</span><br><span> struct stasis_caching_topic *caching_topic;</span><br><span>@@ -888,15 +926,24 @@</span><br><span> }</span><br><span> </span><br><span> caching_topic->topic = stasis_topic_create(new_name);</span><br><span style="color: hsl(0, 100%, 40%);">- ast_free(new_name);</span><br><span> if (caching_topic->topic == NULL) {</span><br><span> ao2_ref(caching_topic, -1);</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_free(new_name);</span><br><span> </span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span> ao2_ref(cache, +1);</span><br><span> caching_topic->cache = cache;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!cache->registered) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ao2_container_register(new_name, cache->entries, print_cache_entry)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_log(LOG_ERROR, "Stasis cache container '%p' for '%s' did not register\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ cache->entries, new_name);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ cache->registered = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_free(new_name);</span><br><span> </span><br><span> caching_topic->sub = internal_stasis_subscribe(original_topic, caching_topic_exec, caching_topic, 0, 0);</span><br><span> if (caching_topic->sub == NULL) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/10023">change 10023</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/10023"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I3d18905e477f3721815da91f30da8d3fbb2d4f56 </div>
<div style="display:none"> Gerrit-Change-Number: 10023 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Richard Mudgett <rmudgett@digium.com> </div>