You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2018/04/16 21:04:59 UTC
[trafficserver] branch 7.1.x updated (1c51f63 -> fe8f5d9)
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a change to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git.
from 1c51f63 Updates to the next release version, and updates STATUS, dangit
new 61c7caa Fix #pragma once error in WCCP.
new 75b0444 Fix cache_read_busy_success_stat
new fe8f5d9 Issue 3350: traffic_server using 100% CPU
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
iocore/cache/CacheRead.cc | 3 ++-
iocore/cache/P_CacheInternal.h | 32 ++++++++++++++++++++------------
lib/wccp/WccpMeta.h | 2 --
mgmt/ProcessManager.cc | 2 ++
4 files changed, 24 insertions(+), 15 deletions(-)
--
To stop receiving notification emails like this one, please contact
zwoop@apache.org.
[trafficserver] 02/03: Fix cache_read_busy_success_stat
Posted by zw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 75b0444cbacd583285490eb7ef11d6f62630b483
Author: Masakazu Kitajo <ma...@apache.org>
AuthorDate: Thu Apr 12 15:43:46 2018 +0900
Fix cache_read_busy_success_stat
The stat was incremented unintentionally in a certain case.
(cherry picked from commit d52f317f704bc87ba2ef223c2a6437df308eabf1)
---
iocore/cache/CacheRead.cc | 3 ++-
iocore/cache/P_CacheInternal.h | 32 ++++++++++++++++++++------------
2 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/iocore/cache/CacheRead.cc b/iocore/cache/CacheRead.cc
index 6b2fbee..7f77ed2 100644
--- a/iocore/cache/CacheRead.cc
+++ b/iocore/cache/CacheRead.cc
@@ -908,8 +908,9 @@ CacheVC::openReadStartEarliest(int /* event ATS_UNUSED */, Event * /* e ATS_UNUS
Lcallreturn:
return handleEvent(AIO_EVENT_DONE, nullptr); // hopefully a tail call
Lsuccess:
- if (write_vc)
+ if (write_vc) {
CACHE_INCREMENT_DYN_STAT(cache_read_busy_success_stat);
+ }
SET_HANDLER(&CacheVC::openReadMain);
return callcont(CACHE_EVENT_OPEN_READ);
}
diff --git a/iocore/cache/P_CacheInternal.h b/iocore/cache/P_CacheInternal.h
index d8bc466..53782e8 100644
--- a/iocore/cache/P_CacheInternal.h
+++ b/iocore/cache/P_CacheInternal.h
@@ -168,23 +168,31 @@ extern RecRawStatBlock *cache_rsb;
#define CACHE_SET_DYN_STAT(x, y) \
RecSetGlobalRawStatSum(cache_rsb, (x), (y)) RecSetGlobalRawStatSum(vol->cache_vol->vol_rsb, (x), (y))
-#define CACHE_INCREMENT_DYN_STAT(x) \
- RecIncrRawStat(cache_rsb, mutex->thread_holding, (int)(x), 1); \
- RecIncrRawStat(vol->cache_vol->vol_rsb, mutex->thread_holding, (int)(x), 1);
+#define CACHE_INCREMENT_DYN_STAT(x) \
+ do { \
+ RecIncrRawStat(cache_rsb, mutex->thread_holding, (int)(x), 1); \
+ RecIncrRawStat(vol->cache_vol->vol_rsb, mutex->thread_holding, (int)(x), 1); \
+ } while (0);
-#define CACHE_DECREMENT_DYN_STAT(x) \
- RecIncrRawStat(cache_rsb, mutex->thread_holding, (int)(x), -1); \
- RecIncrRawStat(vol->cache_vol->vol_rsb, mutex->thread_holding, (int)(x), -1);
+#define CACHE_DECREMENT_DYN_STAT(x) \
+ do { \
+ RecIncrRawStat(cache_rsb, mutex->thread_holding, (int)(x), -1); \
+ RecIncrRawStat(vol->cache_vol->vol_rsb, mutex->thread_holding, (int)(x), -1); \
+ } while (0);
#define CACHE_VOL_SUM_DYN_STAT(x, y) RecIncrRawStat(vol->cache_vol->vol_rsb, mutex->thread_holding, (int)(x), (int64_t)y);
-#define CACHE_SUM_DYN_STAT(x, y) \
- RecIncrRawStat(cache_rsb, mutex->thread_holding, (int)(x), (int64_t)(y)); \
- RecIncrRawStat(vol->cache_vol->vol_rsb, mutex->thread_holding, (int)(x), (int64_t)(y));
+#define CACHE_SUM_DYN_STAT(x, y) \
+ do { \
+ RecIncrRawStat(cache_rsb, mutex->thread_holding, (int)(x), (int64_t)(y)); \
+ RecIncrRawStat(vol->cache_vol->vol_rsb, mutex->thread_holding, (int)(x), (int64_t)(y)); \
+ } while (0);
-#define CACHE_SUM_DYN_STAT_THREAD(x, y) \
- RecIncrRawStat(cache_rsb, this_ethread(), (int)(x), (int64_t)(y)); \
- RecIncrRawStat(vol->cache_vol->vol_rsb, this_ethread(), (int)(x), (int64_t)(y));
+#define CACHE_SUM_DYN_STAT_THREAD(x, y) \
+ do { \
+ RecIncrRawStat(cache_rsb, this_ethread(), (int)(x), (int64_t)(y)); \
+ RecIncrRawStat(vol->cache_vol->vol_rsb, this_ethread(), (int)(x), (int64_t)(y)); \
+ } while (0);
#define GLOBAL_CACHE_SUM_GLOBAL_DYN_STAT(x, y) RecIncrGlobalRawStatSum(cache_rsb, (x), (y))
--
To stop receiving notification emails like this one, please contact
zwoop@apache.org.
[trafficserver] 03/03: Issue 3350: traffic_server using 100% CPU
Posted by zw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit fe8f5d97589f8969ea58c63cd504da59375d6363
Author: Alan Wang <xf...@gmail.com>
AuthorDate: Wed Mar 28 11:23:04 2018 -0700
Issue 3350: traffic_server using 100% CPU
(cherry picked from commit 3a89c6b0a99f7b85cdbe1fb42c181540c3594a08)
---
mgmt/ProcessManager.cc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/mgmt/ProcessManager.cc b/mgmt/ProcessManager.cc
index b0c9be0..2f08027 100644
--- a/mgmt/ProcessManager.cc
+++ b/mgmt/ProcessManager.cc
@@ -52,6 +52,8 @@ startProcessManager(void *arg)
}
if (pmgmt->require_lm) { /* Allow p. process to run w/o a lm */
pmgmt->initLMConnection();
+ } else {
+ return ret;
}
if (pmgmt->init)
--
To stop receiving notification emails like this one, please contact
zwoop@apache.org.
[trafficserver] 01/03: Fix #pragma once error in WCCP.
Posted by zw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 7.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 61c7caa7efef05167c45c63b65c593e4abeb7213
Author: Alan M. Carroll <am...@apache.org>
AuthorDate: Wed Apr 11 10:22:47 2018 -0500
Fix #pragma once error in WCCP.
(cherry picked from commit c799d221c9ccc7d08da2398acd55f35d7afed033)
---
lib/wccp/WccpMeta.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/lib/wccp/WccpMeta.h b/lib/wccp/WccpMeta.h
index 000ba60..fa14171 100644
--- a/lib/wccp/WccpMeta.h
+++ b/lib/wccp/WccpMeta.h
@@ -216,5 +216,3 @@ template <
#endif
} // namespace ts
-
-#endif // TS_WCCP_META_HEADER
--
To stop receiving notification emails like this one, please contact
zwoop@apache.org.