fixing memory leak when use the feature of do a DELETE in a channel

src/ngx_http_push_stream_module_utils.c

@@ -807,6 +807,7 @@ nxg_http_push_stream_free_channel_memory_locked(ngx_slab_pool_t *shpool, ngx_htt
         ngx_slab_free_locked(shpool, cur);
     }
 
+    if (channel->channel_deleted_message != NULL) ngx_http_push_stream_free_message_memory_locked(shpool, channel->channel_deleted_message);
     ngx_slab_free_locked(shpool, channel->id.data);
     ngx_slab_free_locked(shpool, channel);
 }
@@ -818,6 +819,7 @@ ngx_http_push_stream_memory_cleanup()
     ngx_slab_pool_t                        *shpool = (ngx_slab_pool_t *) ngx_http_push_stream_shm_zone->shm.addr;
     ngx_http_push_stream_shm_data_t        *data = (ngx_http_push_stream_shm_data_t *) ngx_http_push_stream_shm_zone->data;
 
+    ngx_http_push_stream_delete_unrecoverable_channels(data, shpool, data->unrecoverable_channels.root);
     ngx_http_push_stream_collect_expired_messages_and_empty_channels(data, shpool, data->tree.root, 0);
     ngx_http_push_stream_free_memory_of_expired_messages_and_channels(0);
 

test/test_cleanup_memory.rb

@@ -10,6 +10,66 @@ class TestCleanupMemory < Test::Unit::TestCase
     @daemon = 'on'
   end
 
+  def config_test_channel_cleanup_after_delete
+    @memory_cleanup_timeout = '30s'
+    @max_reserved_memory = "129k"
+    @min_message_buffer_timeout = '10s'
+    @max_message_buffer_length = nil
+    @publisher_mode = 'admin'
+  end
+
+  def test_channel_cleanup_after_delete
+    channel = 'ch_test_channel_cleanup'
+    headers = {'accept' => 'text/html'}
+    body = 'message to create a channel'
+
+    published_messages_setp_1 = 0
+
+    EventMachine.run do
+      i = 0
+      fill_memory_timer = EventMachine::PeriodicTimer.new(0.001) do
+        pub_1 = EventMachine::HttpRequest.new(nginx_address + '/pub?id=' + channel.to_s + i.to_s).post :body => body, :head => headers, :timeout => 30
+        pub_1.callback do
+          if pub_1.response_header.status == 500
+            fill_memory_timer.cancel
+            i.times do |j|
+              pub = EventMachine::HttpRequest.new(nginx_address + '/pub?id=' + channel.to_s + j.to_s).delete :head => headers, :timeout => 30
+            end
+            pub_2 = EventMachine::HttpRequest.new(nginx_address + '/channels-stats').get :head => headers, :timeout => 60
+            pub_2.callback do
+              fail("Don't received the stats") if (pub_2.response_header.status != 200) || (pub_2.response_header.content_length == 0)
+              result = JSON.parse(pub_2.response)
+              published_messages_setp_1 = result["published_messages"].to_i
+              fail("Don't create any message") if published_messages_setp_1 == 0
+            end
+          end
+        end
+        i += 1
+      end
+
+      EM.add_timer(55) do
+        i = 0
+        fill_memory_timer = EventMachine::PeriodicTimer.new(0.001) do
+          pub_1 = EventMachine::HttpRequest.new(nginx_address + '/pub?id=' + channel.to_s + i.to_s).post :body => body, :head => headers, :timeout => 30
+          pub_1.callback do
+            if pub_1.response_header.status == 500
+              fill_memory_timer.cancel
+              pub_2 = EventMachine::HttpRequest.new(nginx_address + '/channels-stats').get :head => headers, :timeout => 60
+              pub_2.callback do
+                fail("Don't received the stats") if (pub_2.response_header.status != 200) || (pub_2.response_header.content_length == 0)
+                result = JSON.parse(pub_2.response)
+                assert_equal(published_messages_setp_1, result["published_messages"].to_i / 2, "Don't cleaned all memory")
+                EventMachine.stop
+              end
+            end
+          end
+          i += 1
+        end
+      end
+      add_test_timeout(60)
+    end
+  end
+
   def config_test_message_cleanup
     @memory_cleanup_timeout = '30s'
     @max_reserved_memory = "129k"