The commit is pushed to "branch-rh7-3.10.0-123.1.2-ovz" and will appear at
https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-123.1.2.vz7.5.28
------>
commit f0e8345c3754c2a1df494f071f203de5314f6615
Author: Cyrill Gorcunov <gorcu...@virtuozzo.com>
Date: Fri Jul 24 19:31:52 2015 +0400
ve/vznetstat: Don't destroy statistics until explicitly asked
When I've been reworking vznetstat mem management I've added destroying
of VE's statistics upon containers stop. This is incorrect, we need to
keep it while module is alive.
Still one can destroy statistics with VZCTL_TC_DESTROY_STAT
or VZCTL_TC_DESTROY_ALL_STAT (of course it clears it for
non running VEs only).
https://jira.sw.ru/browse/PSBM-35178
v2 (by vdavydov@):
- clear ve::stat in net_exit_acct instead of bunch
cleanup on module exit
Signed-off-by: Cyrill Gorcunov <gorcu...@virtuozzo.com>
CC: Andrey Vagin <ava...@virtuozzo.com>
CC: Vladimir Davydov <vdavy...@virtuozzo.com>
CC: Konstantin Khorenko <khore...@virtuozzo.com>
CC: Pavel Emelyanov <xe...@virtuozzo.com>
CC: Igor Sukhih <i...@parallels.com>
---
kernel/ve/vznetstat/vznetstat.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/kernel/ve/vznetstat/vznetstat.c b/kernel/ve/vznetstat/vznetstat.c
index 91f0a64..9a25dea 100644
--- a/kernel/ve/vznetstat/vznetstat.c
+++ b/kernel/ve/vznetstat/vznetstat.c
@@ -1098,10 +1098,8 @@ static void __net_exit net_exit_acct(struct net *net)
if (ve->stat) {
venet_acct_put_stat(ve->stat);
- if (atomic_read(&ve->stat->users) == 0) {
- venet_acct_destroy_stat(ve->veid);
+ if (atomic_read(&ve->stat->users) == 0)
ve->stat = NULL;
- }
}
}
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
