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 2013/09/04 04:27:05 UTC
[01/21] git commit: Fix git paths for the 4.0.x branch in Jenkins
Updated Branches:
refs/heads/5.0.x a75ebb637 -> 9aad786e8
Fix git paths for the 4.0.x branch in Jenkins
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/98925cb3
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/98925cb3
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/98925cb3
Branch: refs/heads/5.0.x
Commit: 98925cb3265d48fdd46e63d0e00401d0cfbaa331
Parents: 68892bc
Author: Daniel Gruno <hu...@apache.org>
Authored: Fri Aug 30 18:49:23 2013 +0200
Committer: Daniel Gruno <hu...@apache.org>
Committed: Fri Aug 30 18:49:23 2013 +0200
----------------------------------------------------------------------
ci/jenkins/jobs.yaml | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/98925cb3/ci/jenkins/jobs.yaml
----------------------------------------------------------------------
diff --git a/ci/jenkins/jobs.yaml b/ci/jenkins/jobs.yaml
index c6535e7..60ea438 100644
--- a/ci/jenkins/jobs.yaml
+++ b/ci/jenkins/jobs.yaml
@@ -219,7 +219,7 @@
repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-regression':
branch: 4.0.x
- repo: file:///home/jenkins/git/trafficserver_4.4
+ repo: file:///home/jenkins/git/trafficserver_4.0
- project:
name: centos-5-x86
@@ -238,7 +238,7 @@
repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-regression':
branch: 4.0.x
- repo: file:///home/jenkins/git/trafficserver_4.4
+ repo: file:///home/jenkins/git/trafficserver_4.0
- project:
name: centos-6.4-x64
@@ -257,7 +257,7 @@
repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-regression':
branch: 4.0.x
- repo: file:///home/jenkins/git/trafficserver_4.4
+ repo: file:///home/jenkins/git/trafficserver_4.0
- project:
name: centos-6.4-x86
@@ -276,7 +276,7 @@
repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-regression':
branch: 4.0.x
- repo: file:///home/jenkins/git/trafficserver_4.4
+ repo: file:///home/jenkins/git/trafficserver_4.0
- project:
name: fedora-15-x64
@@ -295,7 +295,7 @@
repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-regression':
branch: 4.0.x
- repo: file:///home/jenkins/git/trafficserver_4.4
+ repo: file:///home/jenkins/git/trafficserver_4.0
- project:
name: fedora-15-x86
@@ -314,7 +314,7 @@
repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-regression':
branch: 4.0.x
- repo: file:///home/jenkins/git/trafficserver_4.4
+ repo: file:///home/jenkins/git/trafficserver_4.0
- project:
name: fedora-18-x64
@@ -333,7 +333,7 @@
repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-regression':
branch: 4.0.x
- repo: file:///home/jenkins/git/trafficserver_4.4
+ repo: file:///home/jenkins/git/trafficserver_4.0
- project:
name: fedora-18-x86
@@ -352,7 +352,7 @@
repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-regression':
branch: 4.0.x
- repo: file:///home/jenkins/git/trafficserver_4.4
+ repo: file:///home/jenkins/git/trafficserver_4.0
- project:
name: fedora-rawhide-x64
@@ -371,7 +371,7 @@
repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-regression':
branch: 4.0.x
- repo: file:///home/jenkins/git/trafficserver_4.4
+ repo: file:///home/jenkins/git/trafficserver_4.0
- '{node}-{branch}-clang-regression':
branch: master
repo: file:///home/jenkins/git/trafficserver
@@ -396,7 +396,7 @@
repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-regression':
branch: 4.0.x
- repo: file:///home/jenkins/git/trafficserver_4.4
+ repo: file:///home/jenkins/git/trafficserver_4.0
- project:
name: freebsd-9.1-x64
@@ -415,7 +415,7 @@
repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-regression':
branch: 4.0.x
- repo: file:///home/jenkins/git/trafficserver_4.4
+ repo: file:///home/jenkins/git/trafficserver_4.0
- project:
name: omnios-x64
@@ -434,7 +434,7 @@
repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-regression':
branch: 4.0.x
- repo: file:///home/jenkins/git/trafficserver_4.4
+ repo: file:///home/jenkins/git/trafficserver_4.0
- project:
name: opensuse-12-x64
@@ -453,7 +453,7 @@
repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-regression':
branch: 4.0.x
- repo: file:///home/jenkins/git/trafficserver_4.4
+ repo: file:///home/jenkins/git/trafficserver_4.0
- project:
name: ubuntu-10.04-x64
@@ -475,7 +475,7 @@
repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-regression':
branch: 4.0.x
- repo: file:///home/jenkins/git/trafficserver_4.4
+ repo: file:///home/jenkins/git/trafficserver_4.0
- project:
name: ubuntu-12.04-x64
@@ -497,7 +497,7 @@
repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-regression':
branch: 4.0.x
- repo: file:///home/jenkins/git/trafficserver_4.4
+ repo: file:///home/jenkins/git/trafficserver_4.0
- project:
name: debian-6-x64
@@ -519,6 +519,6 @@
repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-regression':
branch: 4.0.x
- repo: file:///home/jenkins/git/trafficserver_4.4
+ repo: file:///home/jenkins/git/trafficserver_4.0
# vim: sw=4 ts=4 et ft=yaml :
[06/21] git commit: TS-2167: Update apichecker.pl to give suggestions
on additional deprecated APIs
Posted by zw...@apache.org.
TS-2167: Update apichecker.pl to give suggestions on additional deprecated APIs
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/9ad6885d
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/9ad6885d
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/9ad6885d
Branch: refs/heads/5.0.x
Commit: 9ad6885de1dc02275fbbf30556029bd4b1dd05ee
Parents: bb50292
Author: Sean Cosgrave <st...@yahoo-inc.com>
Authored: Fri Aug 30 16:24:20 2013 -0700
Committer: Bryan Call <bc...@apache.org>
Committed: Fri Aug 30 16:24:20 2013 -0700
----------------------------------------------------------------------
tools/apichecker.pl | 179 ++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 178 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9ad6885d/tools/apichecker.pl
----------------------------------------------------------------------
diff --git a/tools/apichecker.pl b/tools/apichecker.pl
index 93ffc9f..706a9b8 100755
--- a/tools/apichecker.pl
+++ b/tools/apichecker.pl
@@ -30,6 +30,81 @@ require 5.006;
#
# tsapi const struct sockaddr_storage *INKHttpTxnClientSockAddrGet(TSHttpTxn txnp);
my %INK_EXCLUDES = (
+ "INKSTAT_TYPE_INT64" => 1,
+ "INKSTAT_TYPE_FLOAT" => 1,
+ "INKStatTypes" => 1,
+ "INKStat" => 1,
+ "INKCoupledStat" => 1,
+ "INKStatCreate" => 1,
+ "INKStatIntAddTo" => 1,
+ "INKStatFloatAddTo" => 1,
+ "INKStatDecrement" => 1,
+ "INKStatIncrement" => 1,
+ "INKStatIntGet" => 1,
+ "INKStatFloatGet" => 1,
+ "INKStatIntSet" => 1,
+ "INKStatFloatSet" => 1,
+ "INKStatCoupledGlobalCategoryCreate" => 1,
+ "INKStatCoupledLocalCopyCreate" => 1,
+ "INKStatCoupledLocalCopyDestroy" => 1,
+ "INKStatCoupledGlobalAdd" => 1,
+ "INKStatCoupledLocalAdd" => 1,
+ "INKStatsCoupledUpdate" => 1,
+ "INKStatCreateV2" => 1,
+ "INKStatIncrementV2" => 1,
+ "INKStatIncrementByNameV2" => 1,
+ "INKStatDecrementV2" => 1,
+ "INKStatDecrementByNameV2" => 1,
+ "INKStatGetCurrentV2" => 1,
+ "INKStatGetCurrentByNameV2" => 1,
+ "INKStatGetV2" => 1,
+ "INKStatGetByNameV2" => 1,
+ "INKMimeFieldCreate" => 1,
+ "INKMimeFieldDestroy" => 1,
+ "INKMimeFieldCopy" => 1,
+ "INKMimeFieldCopyValues" => 1,
+ "INKMimeFieldNext" => 1,
+ "INKMimeFieldLengthGet" => 1,
+ "INKMimeFieldNameGet" => 1,
+ "INKMimeFieldNameSet" => 1,
+ "INKMimeFieldValuesClear" => 1,
+ "INKMimeFieldValuesCount" => 1,
+ "INKMimeFieldValueGet" => 1,
+ "INKMimeFieldValueGetInt" => 1,
+ "INKMimeFieldValueGetUint" => 1,
+ "INKMimeFieldValueGetDate" => 1,
+ "INKMimeFieldValueSet" => 1,
+ "INKMimeFieldValueSetInt" => 1,
+ "INKMimeFieldValueSetUint" => 1,
+ "INKMimeFieldValueSetDate" => 1,
+ "INKMimeFieldValueAppend" => 1,
+ "INKMimeFieldValueInsert" => 1,
+ "INKMimeFieldValueInsertInt" => 1,
+ "INKMimeFieldValueInsertUint" => 1,
+ "INKMimeFieldValueInsertDate" => 1,
+ "INKMimeFieldValueDelete" => 1,
+ "INKMimeHdrFieldValueSet" => 1,
+ "INKMimeHdrFieldValueGet" => 1,
+ "INKMimeHdrFieldInsert" => 1,
+ "INKMimeHdrFieldDelete" => 1,
+ "INKMutexTryLock" => 1,
+ "INKMBufferDataSet" => 1,
+ "INKMBufferDataGet" => 1,
+ "INKMBufferLengthGet" => 1,
+ "INKMBufferRef" => 1,
+ "INKMBufferUnref" => 1,
+ "INKMBufferCompress" => 1,
+ "INKIOBufferDataCreate" => 1,
+ "INKIOBufferBlockCreate" => 1,
+ "INKIOBufferAppend" => 1,
+ "INKCacheHttpInfoCreate" => 1,
+ "INKCacheHttpInfoReqGet" => 1,
+ "INKCacheHttpInfoRespGet" => 1,
+ "INKCacheHttpInfoReqSet" => 1,
+ "INKCacheHttpInfoRespSet" => 1,
+ "INKCacheHttpInfoKeySet" => 1,
+ "INKCacheHttpInfoSizeSet" => 1,
+ "INKCacheHttpInfoVector" => 1,
);
sub ink2ts {
@@ -87,6 +162,46 @@ my %RENAMED = (
"tsremap_remap" => "TSRemapDoRemap",
"tsremap_os_response" => "TSRemapOSResponse",
"rhandle" => "TSHttpTxn",
+ "INKStatCreateV2" => "TSStatCreate",
+ "INKStatIncrementV2" => "TSStatIntIncrement",
+ "INKStatIncrementByNameV2" => "TSStatIntIncrement",
+ "INKStatDecrementV2" => "TSStatIntDecrement",
+ "INKStatDecrementByNameV2" => "TSStatIntDecrement",
+ "INKStatGetCurrentV2" => "TSStatIntGet",
+ "INKStatGetCurrentByNameV2" => "TSStatIntGet",
+ "INKStatGetV2" => "TSStatIntGet",
+ "INKStatGetByNameV2" => "TSStatIntGet",
+ "INKMimeFieldCreate" => "TSMimeHdrFieldCreate",
+ "INKMimeFieldDestroy" => "TSMimeHdrFieldDestroy",
+ "INKMimeFieldCopy" => "TSMimeHdrFieldCopy",
+ "INKMimeFieldCopyValues" => "TSMimeHdrFieldCopyValues",
+ "INKMimeFieldNext" => "TSMimeHdrFieldNext",
+ "INKMimeFieldLengthGet" => "TSMimeHdrFieldLengthGet",
+ "INKMimeFieldNameGet" => "TSMimeHdrFieldNameGet",
+ "INKMimeFieldNameSet" => "TSMimeHdrFieldNameSet",
+ "INKMimeFieldValuesClear" => "TSMimeHdrFieldValuesClear",
+ "INKMimeFieldValuesCount" => "TSMimeHdrFieldValuesCount",
+ "INKMimeHdrFieldValueGet" => "TSMimeHdrFieldValueStringGet",
+ "INKMimeFieldValueGet" => "TSMimeHdrFieldValueStringGet",
+ "INKMimeFieldValueGetInt" => "TSMimeHdrFieldValueIntGet",
+ "INKMimeFieldValueGetUint" => "TSMimeHdrFieldValueUintGet",
+ "INKMimeFieldValueGetDate" => "TSMimeHdrFieldValueDateGet",
+ "INKMimeFieldValueSet" => "TSMimeHdrFieldValueStringSet",
+ "TSMimeHdrFieldValueSet" => "TSMimeHdrFieldValueStringSet",
+ "INKMimeFieldValueSetInt" => "TSMimeHdrFieldValueIntSet",
+ "INKMimeFieldValueSetUint" => "TSMimeHdrFieldValueUintSet",
+ "INKMimeFieldValueSetDate" => "TSMimeHdrFieldValueDateSet",
+ "INKMimeFieldValueAppend" => "TSMimeHdrFieldValueAppend",
+ "INKMimeFieldValueInsert" => "TSMimeHdrFieldValueStringInsert",
+ "INKMimeFieldValueInsertInt" => "TSMimeHdrFieldValueIntInsert",
+ "INKMimeFieldValueInsertUint" => "TSMimeHdrFieldValueUintInsert",
+ "INKMimeFieldValueInsertDate" => "TSMimeHdrFieldValueDateInsert",
+ "INKMimeFieldValueDelete" => "TSMimeHdrFieldValueDelete",
+ "INKMimeHdrFieldInsert" => "TSMimeHdrFieldAppend",
+ "INKMimeHdrFieldDelete" => "TSMimeHdrFieldDestroy",
+ "INKMutexTryLock" => "TSMutexLockTry",
+ "INKIOBufferDataCreate" => "TSIOBufferCreate",
+ "TSIOBufferDataCreate" => "TSIOBufferCreate",
);
my %TWO_2_THREE = (
@@ -238,6 +353,15 @@ my %TWO_2_THREE = (
"tsremap_delete_instance" => [$W_RENAMED],
"tsremap_remap" => [$W_RENAMED, $W_TSREMAPSTATUS],
"tsremap_os_response" => [$W_RENAMED],
+ "INKStatCreateV2" => [$W_RENAMED],
+ "INKStatIncrementV2" => [$W_RENAMED],
+ "INKStatIncrementByNameV2" => [$W_RENAMED],
+ "INKStatDecrementV2" => [$W_RENAMED],
+ "INKStatDecrementByNameV2" => [$W_RENAMED],
+ "INKStatGetCurrentV2" => [$W_RENAMED],
+ "INKStatGetCurrentByNameV2" => [$W_RENAMED],
+ "INKStatGetV2" => [$W_RENAMED],
+ "INKStatGetByNameV2" => [$W_RENAMED],
"orig_url" => [$W_DEPRECATED],
"orig_url_size" => [$W_DEPRECATED],
"request_port" => [$W_DEPRECATED],
@@ -261,6 +385,55 @@ my %TWO_2_THREE = (
"new_matrix" => [$W_DEPRECATED],
"redirect_url" => [$W_DEPRECATED],
"require_ssl" => [$W_DEPRECATED],
+ "INKMimeFieldCreate" => [$W_RENAMED],
+ "INKMimeFieldDestroy" => [$W_RENAMED],
+ "INKMimeFieldCopy" => [$W_RENAMED],
+ "INKMimeFieldCopyValues" => [$W_RENAMED],
+ "INKMimeFieldNext" => [$W_RENAMED],
+ "INKMimeFieldLengthGet" => [$W_RENAMED],
+ "INKMimeFieldNameGet" => [$W_RENAMED],
+ "INKMimeFieldNameSet" => [$W_RENAMED],
+ "INKMimeFieldValuesClear" => [$W_RENAMED],
+ "INKMimeFieldValuesCount" => [$W_RENAMED],
+ "INKMimeFieldValueGet" => [$W_RENAMED],
+ "INKMimeFieldValueGetInt" => [$W_RENAMED],
+ "INKMimeFieldValueGetUint" => [$W_RENAMED],
+ "INKMimeFieldValueGetDate" => [$W_RENAMED],
+ "INKMimeFieldValueSet" => [$W_RENAMED],
+ "INKMimeFieldValueSetInt" => [$W_RENAMED],
+ "INKMimeFieldValueSetUint" => [$W_RENAMED],
+ "INKMimeFieldValueSetDate" => [$W_RENAMED],
+ "INKMimeFieldValueAppend" => [$W_RENAMED],
+ "INKMimeFieldValueInsert" => [$W_RENAMED],
+ "INKMimeFieldValueInsertInt" => [$W_RENAMED],
+ "INKMimeFieldValueInsertUint" => [$W_RENAMED],
+ "INKMimeFieldValueInsertDate" => [$W_RENAMED],
+ "INKMimeFieldValueDelete" => [$W_RENAMED],
+ "INKMimeHdrFieldValueGet" => [$W_RENAMED],
+ "INKMimeHdrFieldValueSet" => [$W_RENAMED],
+ "INKMimeHdrFieldInsert" => [$W_RENAMED],
+ "INKMimeHdrFieldDelete" => [$W_RENAMED],
+ "INKMutexTryLock" => [$W_RENAMED],
+ "INKMBufferDataSet" => [$W_DEPRECATED],
+ "INKMBufferDataGet" => [$W_DEPRECATED],
+ "INKMBufferLengthGet" => [$W_DEPRECATED],
+ "INKMBufferRef" => [$W_DEPRECATED],
+ "INKMBufferUnref" => [$W_DEPRECATED],
+ "INKMBufferCompress" => [$W_DEPRECATED],
+ "INKIOBufferDataCreate" => [$W_RENAMED],
+ "TSIOBufferDataCreate" => [$W_RENAMED],
+ "INKIOBufferBlockCreate" => [$W_DEPRECATED],
+ "TSIOBufferBlockCreate" => [$W_DEPRECATED],
+ "INKIOBufferAppend" => [$W_DEPRECATED],
+ "TSIOBufferAppend" => [$W_DEPRECATED],
+ "INKCacheHttpInfoCreate" => [$W_DEPRECATED],
+ "INKCacheHttpInfoReqGet" => [$W_DEPRECATED],
+ "INKCacheHttpInfoRespGet" => [$W_DEPRECATED],
+ "INKCacheHttpInfoReqSet" => [$W_DEPRECATED],
+ "INKCacheHttpInfoRespSet" => [$W_DEPRECATED],
+ "INKCacheHttpInfoKeySet" => [$W_DEPRECATED],
+ "INKCacheHttpInfoSizeSet" => [$W_DEPRECATED],
+ "INKCacheHttpInfoVector" => [$W_DEPRECATED],
);
@@ -328,7 +501,11 @@ sub process {
while (<FILE>) {
my @tokens = split(/[^a-zA-Z0-9_\.]/);
- if (ink2ts(\@tokens, $_) || two2three(\@tokens, $_)) {
+ if (ink2ts(\@tokens, $_)) {
+ print "$file:$line:$_\n";
+ }
+
+ if (two2three(\@tokens, $_)) {
print "$file:$line:$_\n";
}
[19/21] git commit: ci: fix debug jobs for centos5
Posted by zw...@apache.org.
ci: fix debug jobs for centos5
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/2fbcb5d4
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/2fbcb5d4
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/2fbcb5d4
Branch: refs/heads/5.0.x
Commit: 2fbcb5d4e821b4968d0c10073971c594014dd1d1
Parents: 04e16af
Author: James Peach <jp...@apache.org>
Authored: Tue Sep 3 11:37:31 2013 -0700
Committer: James Peach <jp...@apache.org>
Committed: Tue Sep 3 11:38:42 2013 -0700
----------------------------------------------------------------------
ci/jenkins/jobs.yaml | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2fbcb5d4/ci/jenkins/jobs.yaml
----------------------------------------------------------------------
diff --git a/ci/jenkins/jobs.yaml b/ci/jenkins/jobs.yaml
index 17d71ed..836e1ae 100644
--- a/ci/jenkins/jobs.yaml
+++ b/ci/jenkins/jobs.yaml
@@ -189,12 +189,16 @@
repo: file:///home/jenkins/git/trafficserver
- '{node}-{branch}-{tag}-regression':
branch: 3.2.x
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-{tag}-regression':
branch: 3.2.x
repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-{tag}-regression':
branch: 4.0.x
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver_4.0
- '{node}-{branch}-{tag}-regression':
branch: 4.0.x
@@ -221,12 +225,16 @@
repo: file:///home/jenkins/git/trafficserver
- '{node}-{branch}-{tag}-regression':
branch: 3.2.x
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-{tag}-regression':
branch: 3.2.x
repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-regression':
branch: 4.0.x
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver_4.0
- '{node}-{branch}-{tag}-regression':
branch: 4.0.x
@@ -252,12 +260,16 @@
repo: file:///home/jenkins/git/trafficserver
- '{node}-{branch}-{tag}-regression':
branch: 3.2.x
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-{tag}-regression':
branch: 3.2.x
repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-{tag}-regression':
branch: 4.0.x
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver_4.0
- '{node}-{branch}-{tag}-regression':
branch: 4.0.x
[20/21] git commit: ci: test make distclean in jenkins
Posted by zw...@apache.org.
ci: test make distclean in jenkins
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/b450c84f
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/b450c84f
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/b450c84f
Branch: refs/heads/5.0.x
Commit: b450c84fcb8677378b9ac13f8e5c8493a2f3bfe2
Parents: 2fbcb5d
Author: James Peach <jp...@apache.org>
Authored: Tue Sep 3 16:55:55 2013 -0700
Committer: James Peach <jp...@apache.org>
Committed: Tue Sep 3 16:55:55 2013 -0700
----------------------------------------------------------------------
ci/jenkins/jobs.yaml | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/b450c84f/ci/jenkins/jobs.yaml
----------------------------------------------------------------------
diff --git a/ci/jenkins/jobs.yaml b/ci/jenkins/jobs.yaml
index 836e1ae..cae3da1 100644
--- a/ci/jenkins/jobs.yaml
+++ b/ci/jenkins/jobs.yaml
@@ -39,6 +39,7 @@
- shell: make install
- shell: |
"${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}"/bin/traffic_server -R 1
+ - shell: make distclean
- shell: |
rm -rf "${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}"
@@ -60,6 +61,7 @@
- shell: make install
- shell: |
"${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}"/bin/traffic_server -R 1
+ - shell: make distclean
- shell: |
rm -rf "${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}"
@@ -79,6 +81,7 @@
- shell: gmake install
- shell: |
"${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}"/bin/traffic_server -R 1
+ - shell: gmake distclean
- shell: |
rm -rf "${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}"
@@ -104,6 +107,7 @@
- shell: gmake install
- shell: |
"${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}"/bin/traffic_server -R 1
+ - shell: gmake distclean
- shell: |
rm -rf "${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}"
[02/21] git commit: Add debug builds for 3.2.x and 4.0.x in the CI
Posted by zw...@apache.org.
Add debug builds for 3.2.x and 4.0.x in the CI
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/391e6bec
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/391e6bec
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/391e6bec
Branch: refs/heads/5.0.x
Commit: 391e6becdd878474262dfabce7b3b585b5711266
Parents: 98925cb
Author: Daniel Gruno <hu...@apache.org>
Authored: Fri Aug 30 18:57:45 2013 +0200
Committer: Daniel Gruno <hu...@apache.org>
Committed: Fri Aug 30 18:57:45 2013 +0200
----------------------------------------------------------------------
ci/jenkins/jobs.yaml | 97 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 97 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/391e6bec/ci/jenkins/jobs.yaml
----------------------------------------------------------------------
diff --git a/ci/jenkins/jobs.yaml b/ci/jenkins/jobs.yaml
index 60ea438..afe00f8 100644
--- a/ci/jenkins/jobs.yaml
+++ b/ci/jenkins/jobs.yaml
@@ -217,9 +217,16 @@
- '{node}-{branch}-regression':
branch: 3.2.x
repo: file:///home/jenkins/git/trafficserver_3.2
+ - '{node}-{branch}-debug-regression':
+ branch: 3.2.x
+ repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-regression':
branch: 4.0.x
repo: file:///home/jenkins/git/trafficserver_4.0
+ - '{node}-{branch}-debug-regression':
+ branch: 4.0.x
+ repo: file:///home/jenkins/git/trafficserver_4.0
+
- project:
name: centos-5-x86
@@ -236,9 +243,15 @@
- '{node}-{branch}-regression':
branch: 3.2.x
repo: file:///home/jenkins/git/trafficserver_3.2
+ - '{node}-{branch}-debug-regression':
+ branch: 3.2.x
+ repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-regression':
branch: 4.0.x
repo: file:///home/jenkins/git/trafficserver_4.0
+ - '{node}-{branch}-debug-regression':
+ branch: 4.0.x
+ repo: file:///home/jenkins/git/trafficserver_4.0
- project:
name: centos-6.4-x64
@@ -255,9 +268,15 @@
- '{node}-{branch}-regression':
branch: 3.2.x
repo: file:///home/jenkins/git/trafficserver_3.2
+ - '{node}-{branch}-debug-regression':
+ branch: 3.2.x
+ repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-regression':
branch: 4.0.x
repo: file:///home/jenkins/git/trafficserver_4.0
+ - '{node}-{branch}-debug-regression':
+ branch: 4.0.x
+ repo: file:///home/jenkins/git/trafficserver_4.0
- project:
name: centos-6.4-x86
@@ -274,9 +293,15 @@
- '{node}-{branch}-regression':
branch: 3.2.x
repo: file:///home/jenkins/git/trafficserver_3.2
+ - '{node}-{branch}-debug-regression':
+ branch: 3.2.x
+ repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-regression':
branch: 4.0.x
repo: file:///home/jenkins/git/trafficserver_4.0
+ - '{node}-{branch}-debug-regression':
+ branch: 4.0.x
+ repo: file:///home/jenkins/git/trafficserver_4.0
- project:
name: fedora-15-x64
@@ -293,9 +318,15 @@
- '{node}-{branch}-regression':
branch: 3.2.x
repo: file:///home/jenkins/git/trafficserver_3.2
+ - '{node}-{branch}-debug-regression':
+ branch: 3.2.x
+ repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-regression':
branch: 4.0.x
repo: file:///home/jenkins/git/trafficserver_4.0
+ - '{node}-{branch}-debug-regression':
+ branch: 4.0.x
+ repo: file:///home/jenkins/git/trafficserver_4.0
- project:
name: fedora-15-x86
@@ -312,9 +343,15 @@
- '{node}-{branch}-regression':
branch: 3.2.x
repo: file:///home/jenkins/git/trafficserver_3.2
+ - '{node}-{branch}-debug-regression':
+ branch: 3.2.x
+ repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-regression':
branch: 4.0.x
repo: file:///home/jenkins/git/trafficserver_4.0
+ - '{node}-{branch}-debug-regression':
+ branch: 4.0.x
+ repo: file:///home/jenkins/git/trafficserver_4.0
- project:
name: fedora-18-x64
@@ -331,9 +368,15 @@
- '{node}-{branch}-regression':
branch: 3.2.x
repo: file:///home/jenkins/git/trafficserver_3.2
+ - '{node}-{branch}-debug-regression':
+ branch: 3.2.x
+ repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-regression':
branch: 4.0.x
repo: file:///home/jenkins/git/trafficserver_4.0
+ - '{node}-{branch}-debug-regression':
+ branch: 4.0.x
+ repo: file:///home/jenkins/git/trafficserver_4.0
- project:
name: fedora-18-x86
@@ -350,9 +393,15 @@
- '{node}-{branch}-regression':
branch: 3.2.x
repo: file:///home/jenkins/git/trafficserver_3.2
+ - '{node}-{branch}-debug-regression':
+ branch: 3.2.x
+ repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-regression':
branch: 4.0.x
repo: file:///home/jenkins/git/trafficserver_4.0
+ - '{node}-{branch}-debug-regression':
+ branch: 4.0.x
+ repo: file:///home/jenkins/git/trafficserver_4.0
- project:
name: fedora-rawhide-x64
@@ -369,9 +418,15 @@
- '{node}-{branch}-regression':
branch: 3.2.x
repo: file:///home/jenkins/git/trafficserver_3.2
+ - '{node}-{branch}-debug-regression':
+ branch: 3.2.x
+ repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-regression':
branch: 4.0.x
repo: file:///home/jenkins/git/trafficserver_4.0
+ - '{node}-{branch}-debug-regression':
+ branch: 4.0.x
+ repo: file:///home/jenkins/git/trafficserver_4.0
- '{node}-{branch}-clang-regression':
branch: master
repo: file:///home/jenkins/git/trafficserver
@@ -394,9 +449,15 @@
- '{node}-{branch}-regression':
branch: 3.2.x
repo: file:///home/jenkins/git/trafficserver_3.2
+ - '{node}-{branch}-debug-regression':
+ branch: 3.2.x
+ repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-regression':
branch: 4.0.x
repo: file:///home/jenkins/git/trafficserver_4.0
+ - '{node}-{branch}-debug-regression':
+ branch: 4.0.x
+ repo: file:///home/jenkins/git/trafficserver_4.0
- project:
name: freebsd-9.1-x64
@@ -413,9 +474,15 @@
- '{node}-{branch}-regression':
branch: 3.2.x
repo: file:///home/jenkins/git/trafficserver_3.2
+ - '{node}-{branch}-debug-regression':
+ branch: 3.2.x
+ repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-regression':
branch: 4.0.x
repo: file:///home/jenkins/git/trafficserver_4.0
+ - '{node}-{branch}-debug-regression':
+ branch: 4.0.x
+ repo: file:///home/jenkins/git/trafficserver_4.0
- project:
name: omnios-x64
@@ -432,9 +499,15 @@
- '{node}-{branch}-regression':
branch: 3.2.x
repo: file:///home/jenkins/git/trafficserver_3.2
+ - '{node}-{branch}-debug-regression':
+ branch: 3.2.x
+ repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-regression':
branch: 4.0.x
repo: file:///home/jenkins/git/trafficserver_4.0
+ - '{node}-{branch}-debug-regression':
+ branch: 4.0.x
+ repo: file:///home/jenkins/git/trafficserver_4.0
- project:
name: opensuse-12-x64
@@ -451,9 +524,15 @@
- '{node}-{branch}-regression':
branch: 3.2.x
repo: file:///home/jenkins/git/trafficserver_3.2
+ - '{node}-{branch}-debug-regression':
+ branch: 3.2.x
+ repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-regression':
branch: 4.0.x
repo: file:///home/jenkins/git/trafficserver_4.0
+ - '{node}-{branch}-debug-regression':
+ branch: 4.0.x
+ repo: file:///home/jenkins/git/trafficserver_4.0
- project:
name: ubuntu-10.04-x64
@@ -473,9 +552,15 @@
- '{node}-{branch}-regression':
branch: 3.2.x
repo: file:///home/jenkins/git/trafficserver_3.2
+ - '{node}-{branch}-debug-regression':
+ branch: 3.2.x
+ repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-regression':
branch: 4.0.x
repo: file:///home/jenkins/git/trafficserver_4.0
+ - '{node}-{branch}-debug-regression':
+ branch: 4.0.x
+ repo: file:///home/jenkins/git/trafficserver_4.0
- project:
name: ubuntu-12.04-x64
@@ -495,9 +580,15 @@
- '{node}-{branch}-regression':
branch: 3.2.x
repo: file:///home/jenkins/git/trafficserver_3.2
+ - '{node}-{branch}-debug-regression':
+ branch: 3.2.x
+ repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-regression':
branch: 4.0.x
repo: file:///home/jenkins/git/trafficserver_4.0
+ - '{node}-{branch}-debug-regression':
+ branch: 4.0.x
+ repo: file:///home/jenkins/git/trafficserver_4.0
- project:
name: debian-6-x64
@@ -517,8 +608,14 @@
- '{node}-{branch}-regression':
branch: 3.2.x
repo: file:///home/jenkins/git/trafficserver_3.2
+ - '{node}-{branch}-debug-regression':
+ branch: 3.2.x
+ repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-regression':
branch: 4.0.x
repo: file:///home/jenkins/git/trafficserver_4.0
+ - '{node}-{branch}-debug-regression':
+ branch: 4.0.x
+ repo: file:///home/jenkins/git/trafficserver_4.0
# vim: sw=4 ts=4 et ft=yaml :
[07/21] git commit: added TS-2167
Posted by zw...@apache.org.
added TS-2167
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/eca83827
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/eca83827
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/eca83827
Branch: refs/heads/5.0.x
Commit: eca838271ba490670d885e917521ee6e0b6b4a52
Parents: 9ad6885
Author: Bryan Call <bc...@apache.org>
Authored: Fri Aug 30 16:30:14 2013 -0700
Committer: Bryan Call <bc...@apache.org>
Committed: Fri Aug 30 16:30:14 2013 -0700
----------------------------------------------------------------------
CHANGES | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/eca83827/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 1db2fe6..24b2323 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 4.1.0
+ *) [TS-2167] Update apichecker.pl to give suggestions on additional
+ deprecated APIs
+
*) [TS-2163] Remove WDA_BILLING, ACC_ALARMS etc. code and definitions.
*) [TS-2156] Fix stats trap in different type of threads
[12/21] git commit: TS-2165: Introduce cluster-wide logging stats
Posted by zw...@apache.org.
TS-2165: Introduce cluster-wide logging stats
With this patch, we can see the logging status of whole cluster.
Signed-off-by: Yunkai Zhang <qi...@taobao.com>
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/49e8a7a0
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/49e8a7a0
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/49e8a7a0
Branch: refs/heads/5.0.x
Commit: 49e8a7a0e538a53083b564baaf06a51f96acc831
Parents: a415123
Author: Yunkai Zhang <qi...@taobao.com>
Authored: Thu Aug 29 01:27:33 2013 +0800
Committer: Yunkai Zhang <qi...@taobao.com>
Committed: Mon Sep 2 16:35:13 2013 +0800
----------------------------------------------------------------------
CHANGES | 2 +
mgmt/RecordsConfig.cc | 110 ++++++++++++++++++++
proxy/config/stats.config.xml.default | 156 +++++++++++++++++++++++++++++
proxy/logging/Log.cc | 16 ++-
proxy/logging/LogConfig.cc | 24 ++++-
proxy/logging/LogConfig.h | 6 ++
proxy/logging/LogFile.cc | 11 +-
proxy/logging/LogHost.cc | 8 ++
proxy/logging/LogObject.cc | 3 +
9 files changed, 329 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/49e8a7a0/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 24b2323..5a80c2f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 4.1.0
+ *) [TS-2165] Introduce cluster-wide logging stats
+
*) [TS-2167] Update apichecker.pl to give suggestions on additional
deprecated APIs
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/49e8a7a0/mgmt/RecordsConfig.cc
----------------------------------------------------------------------
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index 93e8c7d..da8e36e 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -1671,6 +1671,61 @@ RecordElement RecordsConfig[] = {
{RECT_NODE, "proxy.node.user_agents_total_documents_served", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
+ //
+ //#
+ //# Logging stats on NODE
+ //#
+ {RECT_NODE, "proxy.node.log.event_log_error_ok", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_NODE, "proxy.node.log.event_log_error_skip", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_NODE, "proxy.node.log.event_log_error_aggr", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_NODE, "proxy.node.log.event_log_error_full", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_NODE, "proxy.node.log.event_log_error_fail", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_NODE, "proxy.node.log.event_log_access_ok", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_NODE, "proxy.node.log.event_log_access_skip", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_NODE, "proxy.node.log.event_log_access_aggr", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_NODE, "proxy.node.log.event_log_access_full", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_NODE, "proxy.node.log.event_log_access_fail", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_NODE, "proxy.node.log.num_sent_to_network", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_NODE, "proxy.node.log.num_lost_before_sent_to_network", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_NODE, "proxy.node.log.num_received_from_network", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_NODE, "proxy.node.log.num_flush_to_disk", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_NODE, "proxy.node.log.num_lost_before_flush_to_disk", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_NODE, "proxy.node.log.bytes_lost_before_preproc", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_NODE, "proxy.node.log.bytes_sent_to_network", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_NODE, "proxy.node.log.bytes_lost_before_sent_to_network", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_NODE, "proxy.node.log.bytes_sent_to_network_avg_10s", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_NODE, "proxy.node.log.bytes_received_from_network", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_NODE, "proxy.node.log.bytes_received_from_network_avg_10s", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_NODE, "proxy.node.log.bytes_flush_to_disk", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_NODE, "proxy.node.log.bytes_lost_before_flush_to_disk", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_NODE, "proxy.node.log.bytes_written_to_disk", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_NODE, "proxy.node.log.bytes_lost_before_written_to_disk", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+
//#
//# Add CLUSTER Records Here
//#
@@ -1781,6 +1836,61 @@ RecordElement RecordsConfig[] = {
{RECT_CLUSTER, "proxy.cluster.current_server_connections", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
,
+ //
+ //#
+ //# Logging stats on CLUSTER
+ //#
+ {RECT_CLUSTER, "proxy.cluster.log.event_log_error_ok", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CLUSTER, "proxy.cluster.log.event_log_error_skip", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CLUSTER, "proxy.cluster.log.event_log_error_aggr", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CLUSTER, "proxy.cluster.log.event_log_error_full", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CLUSTER, "proxy.cluster.log.event_log_error_fail", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CLUSTER, "proxy.cluster.log.event_log_access_ok", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CLUSTER, "proxy.cluster.log.event_log_access_skip", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CLUSTER, "proxy.cluster.log.event_log_access_aggr", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CLUSTER, "proxy.cluster.log.event_log_access_full", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CLUSTER, "proxy.cluster.log.event_log_access_fail", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CLUSTER, "proxy.cluster.log.num_sent_to_network", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CLUSTER, "proxy.cluster.log.num_lost_before_sent_to_network", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CLUSTER, "proxy.cluster.log.num_received_from_network", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CLUSTER, "proxy.cluster.log.num_flush_to_disk", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CLUSTER, "proxy.cluster.log.num_lost_before_flush_to_disk", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CLUSTER, "proxy.cluster.log.bytes_lost_before_preproc", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CLUSTER, "proxy.cluster.log.bytes_sent_to_network", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CLUSTER, "proxy.cluster.log.bytes_lost_before_sent_to_network", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CLUSTER, "proxy.cluster.log.bytes_sent_to_network_avg_10s", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CLUSTER, "proxy.cluster.log.bytes_received_from_network", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CLUSTER, "proxy.cluster.log.bytes_received_from_network_avg_10s", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CLUSTER, "proxy.cluster.log.bytes_flush_to_disk", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CLUSTER, "proxy.cluster.log.bytes_lost_before_flush_to_disk", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CLUSTER, "proxy.cluster.log.bytes_written_to_disk", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+ {RECT_CLUSTER, "proxy.cluster.log.bytes_lost_before_written_to_disk", RECD_INT, "0", RECU_NULL, RR_NULL, RECC_NULL, NULL, RECA_NULL}
+ ,
+
//#
//# SSL parent proxying info
//#
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/49e8a7a0/proxy/config/stats.config.xml.default
----------------------------------------------------------------------
diff --git a/proxy/config/stats.config.xml.default b/proxy/config/stats.config.xml.default
index ac6d211..6d97a7a 100644
--- a/proxy/config/stats.config.xml.default
+++ b/proxy/config/stats.config.xml.default
@@ -1790,6 +1790,162 @@
</expression>
</statistics>
+ <!-- Logging -->
+ <statistics
+ minimum="0">
+ <destination>proxy.node.log.event_log_access_ok</destination>
+ <destination scope="cluster">proxy.cluster.log.event_log_access_ok</destination>
+ <expression>
+ proxy.process.log.event_log_access_ok
+ </expression>
+ </statistics>
+
+ <statistics
+ minimum="0">
+ <destination>proxy.node.log.event_log_access_skip</destination>
+ <destination scope="cluster">proxy.cluster.log.event_log_access_skip</destination>
+ <expression>
+ proxy.process.log.event_log_access_skip
+ </expression>
+ </statistics>
+
+ <statistics
+ minimum="0">
+ <destination>proxy.node.log.event_log_access_aggr</destination>
+ <destination scope="cluster">proxy.cluster.log.event_log_access_aggr</destination>
+ <expression>
+ proxy.process.log.event_log_access_aggr
+ </expression>
+ </statistics>
+
+ <statistics
+ minimum="0">
+ <destination>proxy.node.log.event_log_access_full</destination>
+ <destination scope="cluster">proxy.cluster.log.event_log_access_full</destination>
+ <expression>
+ proxy.process.log.event_log_access_full
+ </expression>
+ </statistics>
+
+ <statistics
+ minimum="0">
+ <destination>proxy.node.log.event_log_access_fail</destination>
+ <destination scope="cluster">proxy.cluster.log.event_log_access_fail</destination>
+ <expression>
+ proxy.process.log.event_log_access_fail
+ </expression>
+ </statistics>
+
+ <statistics
+ minimum="0">
+ <destination>proxy.node.log.num_lost_before_sent_to_network</destination>
+ <destination scope="cluster">proxy.cluster.log.num_lost_before_sent_to_network</destination>
+ <expression>
+ proxy.process.log.num_lost_before_sent_to_network
+ </expression>
+ </statistics>
+
+ <statistics
+ minimum="0">
+ <destination>proxy.node.log.num_sent_to_network</destination>
+ <destination scope="cluster">proxy.cluster.log.num_sent_to_network</destination>
+ <expression>
+ proxy.process.log.num_sent_to_network
+ </expression>
+ </statistics>
+
+ <statistics
+ minimum="0">
+ <destination>proxy.node.log.bytes_lost_before_sent_to_network</destination>
+ <destination scope="cluster">proxy.cluster.log.bytes_lost_before_sent_to_network</destination>
+ <expression>
+ proxy.process.log.bytes_lost_before_sent_to_network
+ </expression>
+ </statistics>
+
+ <statistics
+ minimum="0">
+ <destination>proxy.node.log.bytes_sent_to_network</destination>
+ <destination scope="cluster">proxy.cluster.log.bytes_sent_to_network</destination>
+ <expression>
+ proxy.process.log.bytes_sent_to_network
+ </expression>
+ </statistics>
+
+ <statistics
+ minimum="0">
+ <destination>proxy.node.log.num_received_from_network</destination>
+ <destination scope="cluster">proxy.cluster.log.num_received_from_network</destination>
+ <expression>
+ proxy.process.log.num_received_from_network
+ </expression>
+ </statistics>
+
+ <statistics
+ minimum="0">
+ <destination>proxy.node.log.bytes_received_from_network</destination>
+ <destination scope="cluster">proxy.cluster.log.bytes_received_from_network</destination>
+ <expression>
+ proxy.process.log.bytes_received_from_network
+ </expression>
+ </statistics>
+
+ <statistics
+ minimum="0">
+ <destination>proxy.node.log.bytes_lost_before_preproc</destination>
+ <destination scope="cluster">proxy.cluster.log.bytes_lost_before_preproc</destination>
+ <expression>
+ proxy.process.log.bytes_lost_before_preproc
+ </expression>
+ </statistics>
+
+ <statistics
+ minimum="0">
+ <destination>proxy.node.log.num_lost_before_flush_to_disk</destination>
+ <destination scope="cluster">proxy.cluster.log.num_lost_before_flush_to_disk</destination>
+ <expression>
+ proxy.process.log.num_lost_before_flush_to_disk
+ </expression>
+ </statistics>
+
+ <statistics
+ minimum="0">
+ <destination>proxy.node.log.bytes_lost_before_flush_to_disk</destination>
+ <destination scope="cluster">proxy.cluster.log.bytes_lost_before_flush_to_disk</destination>
+ <expression>
+ proxy.process.log.bytes_lost_before_flush_to_disk
+ </expression>
+ </statistics>
+
+ <statistics
+ minimum="0">
+ <destination>proxy.node.log.bytes_lost_before_written_to_disk</destination>
+ <destination scope="cluster">proxy.cluster.log.bytes_lost_before_written_to_disk</destination>
+ <expression>
+ proxy.process.log.bytes_lost_before_written_to_disk
+ </expression>
+ </statistics>
+
+ <statistics
+ minimum="0"
+ interval="10">
+ <destination>proxy.node.log.bytes_sent_to_network_avg_10s</destination>
+ <destination scope="cluster">proxy.cluster.log.bytes_sent_to_network_avg_10s</destination>
+ <expression>
+ #proxy.process.log.bytes_sent_to_network
+ </expression>
+ </statistics>
+
+ <statistics
+ minimum="0"
+ interval="10">
+ <destination>proxy.node.log.bytes_received_from_network_avg_10s</destination>
+ <destination scope="cluster">proxy.cluster.log.bytes_received_from_network_avg_10s</destination>
+ <expression>
+ #proxy.process.log.bytes_received_from_network
+ </expression>
+ </statistics>
+
</ink:statistics>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/49e8a7a0/proxy/logging/Log.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/Log.cc b/proxy/logging/Log.cc
index ec3c7ca..ea6493f 100644
--- a/proxy/logging/Log.cc
+++ b/proxy/logging/Log.cc
@@ -1370,6 +1370,10 @@ Log::flush_thread_main(void * /* args ATS_UNUSED */)
if (!logfile->is_open()) {
Warning("File:%s was closed, have dropped (%d) bytes.",
logfile->m_name, total_bytes);
+
+ RecIncrRawStat(log_rsb, mutex->thread_holding,
+ log_stat_bytes_lost_before_written_to_disk_stat,
+ total_bytes);
delete fdata;
continue;
}
@@ -1380,6 +1384,10 @@ Log::flush_thread_main(void * /* args ATS_UNUSED */)
if (Log::config->logging_space_exhausted) {
Warning("logging space exhausted, failed to write file:%s, have dropped (%d) bytes.",
logfile->m_name, (total_bytes - bytes_written));
+
+ RecIncrRawStat(log_rsb, mutex->thread_holding,
+ log_stat_bytes_lost_before_written_to_disk_stat,
+ total_bytes - bytes_written);
break;
}
@@ -1387,8 +1395,12 @@ Log::flush_thread_main(void * /* args ATS_UNUSED */)
total_bytes - bytes_written);
if (len < 0) {
Error("Failed to write log to %s: [tried %d, wrote %d, %s]",
- logfile->m_name, total_bytes, bytes_written, strerror(errno));
- ink_release_assert(!"test");
+ logfile->m_name, total_bytes - bytes_written,
+ bytes_written, strerror(errno));
+
+ RecIncrRawStat(log_rsb, mutex->thread_holding,
+ log_stat_bytes_lost_before_written_to_disk_stat,
+ total_bytes - bytes_written);
break;
}
bytes_written += len;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/49e8a7a0/proxy/logging/LogConfig.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogConfig.cc b/proxy/logging/LogConfig.cc
index 7dbabed..d04fd48 100644
--- a/proxy/logging/LogConfig.cc
+++ b/proxy/logging/LogConfig.cc
@@ -1349,25 +1349,43 @@ LogConfig::register_stat_callbacks()
//
RecRegisterRawStat(log_rsb, RECT_PROCESS,
"proxy.process.log.num_sent_to_network",
- RECD_INT, RECP_PERSISTENT, (int) log_stat_num_sent_to_network_stat, RecRawStatSyncSum);
+ RECD_COUNTER, RECP_PERSISTENT, (int) log_stat_num_sent_to_network_stat, RecRawStatSyncSum);
+ RecRegisterRawStat(log_rsb, RECT_PROCESS,
+ "proxy.process.log.num_lost_before_sent_to_network",
+ RECD_COUNTER, RECP_PERSISTENT, (int) log_stat_num_lost_before_sent_to_network_stat, RecRawStatSyncSum);
RecRegisterRawStat(log_rsb, RECT_PROCESS,
"proxy.process.log.num_received_from_network",
- RECD_INT, RECP_PERSISTENT, (int) log_stat_num_received_from_network_stat, RecRawStatSyncSum);
+ RECD_COUNTER, RECP_PERSISTENT, (int) log_stat_num_received_from_network_stat, RecRawStatSyncSum);
RecRegisterRawStat(log_rsb, RECT_PROCESS,
"proxy.process.log.num_flush_to_disk",
- RECD_INT, RECP_PERSISTENT, (int) log_stat_num_flush_to_disk_stat, RecRawStatSyncSum);
+ RECD_COUNTER, RECP_PERSISTENT, (int) log_stat_num_flush_to_disk_stat, RecRawStatSyncSum);
+ RecRegisterRawStat(log_rsb, RECT_PROCESS,
+ "proxy.process.log.num_lost_before_flush_to_disk",
+ RECD_COUNTER, RECP_PERSISTENT, (int) log_stat_num_lost_before_flush_to_disk_stat, RecRawStatSyncSum);
+ RecRegisterRawStat(log_rsb, RECT_PROCESS,
+ "proxy.process.log.bytes_lost_before_preproc",
+ RECD_INT, RECP_PERSISTENT, (int) log_stat_bytes_lost_before_preproc_stat, RecRawStatSyncSum);
RecRegisterRawStat(log_rsb, RECT_PROCESS,
"proxy.process.log.bytes_sent_to_network",
RECD_INT, RECP_PERSISTENT, (int) log_stat_bytes_sent_to_network_stat, RecRawStatSyncSum);
RecRegisterRawStat(log_rsb, RECT_PROCESS,
+ "proxy.process.log.bytes_lost_before_sent_to_network",
+ RECD_INT, RECP_PERSISTENT, (int) log_stat_bytes_lost_before_sent_to_network_stat, RecRawStatSyncSum);
+ RecRegisterRawStat(log_rsb, RECT_PROCESS,
"proxy.process.log.bytes_received_from_network",
RECD_INT, RECP_PERSISTENT, (int) log_stat_bytes_received_from_network_stat, RecRawStatSyncSum);
RecRegisterRawStat(log_rsb, RECT_PROCESS,
"proxy.process.log.bytes_flush_to_disk",
RECD_INT, RECP_PERSISTENT, (int) log_stat_bytes_flush_to_disk_stat, RecRawStatSyncSum);
RecRegisterRawStat(log_rsb, RECT_PROCESS,
+ "proxy.process.log.bytes_lost_before_flush_to_disk",
+ RECD_INT, RECP_PERSISTENT, (int) log_stat_bytes_lost_before_flush_to_disk_stat, RecRawStatSyncSum);
+ RecRegisterRawStat(log_rsb, RECT_PROCESS,
"proxy.process.log.bytes_written_to_disk",
RECD_INT, RECP_PERSISTENT, (int) log_stat_bytes_written_to_disk_stat, RecRawStatSyncSum);
+ RecRegisterRawStat(log_rsb, RECT_PROCESS,
+ "proxy.process.log.bytes_lost_before_written_to_disk",
+ RECD_INT, RECP_PERSISTENT, (int) log_stat_bytes_lost_before_written_to_disk_stat, RecRawStatSyncSum);
//
// I/O
//
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/49e8a7a0/proxy/logging/LogConfig.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogConfig.h b/proxy/logging/LogConfig.h
index d9e46c4..f715e8c 100644
--- a/proxy/logging/LogConfig.h
+++ b/proxy/logging/LogConfig.h
@@ -50,14 +50,20 @@ enum
// Logging Data
log_stat_num_sent_to_network_stat,
+ log_stat_num_lost_before_sent_to_network_stat,
log_stat_num_received_from_network_stat,
log_stat_num_flush_to_disk_stat,
+ log_stat_num_lost_before_flush_to_disk_stat,
+ log_stat_bytes_lost_before_preproc_stat,
log_stat_bytes_sent_to_network_stat,
+ log_stat_bytes_lost_before_sent_to_network_stat,
log_stat_bytes_received_from_network_stat,
log_stat_bytes_flush_to_disk_stat,
+ log_stat_bytes_lost_before_flush_to_disk_stat,
log_stat_bytes_written_to_disk_stat,
+ log_stat_bytes_lost_before_written_to_disk_stat,
// Logging I/O
log_stat_log_files_open_stat,
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/49e8a7a0/proxy/logging/LogFile.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogFile.cc b/proxy/logging/LogFile.cc
index c27dc20..68aa90c 100644
--- a/proxy/logging/LogFile.cc
+++ b/proxy/logging/LogFile.cc
@@ -628,6 +628,7 @@ LogFile::write_ascii_logbuffer3(LogBufferHeader * buffer_header, char *alt_forma
Debug("log-file", "entering LogFile::write_ascii_logbuffer3 for %s " "(this=%p)", m_name, this);
ink_assert(buffer_header != NULL);
+ ProxyMutex *mutex = this_thread()->mutex;
LogBufferIterator iter(buffer_header);
LogEntryHeader *entry_header;
int fmt_entry_count = 0;
@@ -684,6 +685,14 @@ LogFile::write_ascii_logbuffer3(LogBufferHeader * buffer_header, char *alt_forma
} else {
Error("Failed to convert LogBuffer to ascii, have dropped (%" PRIu32 ") bytes.",
entry_header->entry_len);
+
+ RecIncrRawStat(log_rsb, mutex->thread_holding,
+ log_stat_num_lost_before_flush_to_disk_stat,
+ fmt_entry_count);
+
+ RecIncrRawStat(log_rsb, mutex->thread_holding,
+ log_stat_bytes_lost_before_flush_to_disk_stat,
+ fmt_buf_bytes);
}
// if writing to a pipe, fill the buffer with a single
// record to avoid as much as possible overflowing the
@@ -700,8 +709,6 @@ LogFile::write_ascii_logbuffer3(LogBufferHeader * buffer_header, char *alt_forma
//
LogFlushData *flush_data = new LogFlushData(this, ascii_buffer, fmt_buf_bytes);
- ProxyMutex *mutex = this_thread()->mutex;
-
RecIncrRawStat(log_rsb, mutex->thread_holding, log_stat_num_flush_to_disk_stat,
fmt_entry_count);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/49e8a7a0/proxy/logging/LogHost.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogHost.cc b/proxy/logging/LogHost.cc
index 54297f5..84e08f4 100644
--- a/proxy/logging/LogHost.cc
+++ b/proxy/logging/LogHost.cc
@@ -343,6 +343,14 @@ done:
void
LogHost::orphan_write_and_try_delete(LogBuffer * lb)
{
+ RecIncrRawStat(log_rsb, this_thread()->mutex->thread_holding,
+ log_stat_num_lost_before_sent_to_network_stat,
+ lb->header()->entry_count);
+
+ RecIncrRawStat(log_rsb, this_thread()->mutex->thread_holding,
+ log_stat_bytes_lost_before_sent_to_network_stat,
+ lb->header()->byte_count);
+
if (!Log::config->logging_space_exhausted) {
Debug("log-host", "Sending LogBuffer to orphan file %s", m_orphan_file->get_name());
m_orphan_file->preproc_and_try_delete(lb);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/49e8a7a0/proxy/logging/LogObject.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogObject.cc b/proxy/logging/LogObject.cc
index 7bcbf9f..089c8eb 100644
--- a/proxy/logging/LogObject.cc
+++ b/proxy/logging/LogObject.cc
@@ -51,6 +51,9 @@ LogBufferManager::preproc_buffers(LogBufferSink *sink) {
delete b;
ink_atomic_increment(&_num_flush_buffers, -1);
Warning("Dropping log buffer, can't keep up.");
+ RecIncrRawStat(log_rsb, this_thread()->mutex->thread_holding,
+ log_stat_bytes_lost_before_preproc_stat,
+ b->header()->byte_count);
} else {
new_q.push(b);
}
[09/21] git commit: ci: shrink builders pollng period
Posted by zw...@apache.org.
ci: shrink builders pollng period
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/74e88dec
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/74e88dec
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/74e88dec
Branch: refs/heads/5.0.x
Commit: 74e88decb1fbf187025b9f815b07f78aa81263af
Parents: 0e4b5fe
Author: James Peach <jp...@apache.org>
Authored: Sat Aug 31 10:20:34 2013 -0700
Committer: James Peach <jp...@apache.org>
Committed: Sat Aug 31 10:20:50 2013 -0700
----------------------------------------------------------------------
ci/jenkins/jobs.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/74e88dec/ci/jenkins/jobs.yaml
----------------------------------------------------------------------
diff --git a/ci/jenkins/jobs.yaml b/ci/jenkins/jobs.yaml
index 148b67d..17d71ed 100644
--- a/ci/jenkins/jobs.yaml
+++ b/ci/jenkins/jobs.yaml
@@ -22,7 +22,7 @@
artifactDaysToKeep: -1
artifactNumToKeep: 2
triggers:
- - pollscm: 'H * * * *'
+ - pollscm: 'H/30 * * * *'
- builder:
name: linux-regression
[08/21] git commit: Fix the 4.0.1 relase
Posted by zw...@apache.org.
Fix the 4.0.1 relase
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/372d46a3
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/372d46a3
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/372d46a3
Branch: refs/heads/5.0.x
Commit: 372d46a3564cebcc18d2c47185cdea17fc20fda2
Parents: eca8382
Author: Leif Hedstrom <zw...@apache.org>
Authored: Fri Aug 30 21:39:53 2013 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Fri Aug 30 21:39:53 2013 -0600
----------------------------------------------------------------------
STATUS | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/372d46a3/STATUS
----------------------------------------------------------------------
diff --git a/STATUS b/STATUS
index ae6370c..7f3141a 100644
--- a/STATUS
+++ b/STATUS
@@ -8,7 +8,7 @@ The current version of this file can be found at:
Release history:
- 4.0.0 : Released on Aug 30th, 2013
+ 4.0.1 : Released on Aug 30th, 2013
3.3.5 : Released on Aug 16th, 2013
3.3.4 : Released on June 10th, 2013
[16/21] git commit: TS-2172: automake subdir-objects requires
AM_PROG_CC_C_O
Posted by zw...@apache.org.
TS-2172: automake subdir-objects requires AM_PROG_CC_C_O
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/3fed45cd
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/3fed45cd
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/3fed45cd
Branch: refs/heads/5.0.x
Commit: 3fed45cdc3b18d048c657502fbaf61d1b12a9ee5
Parents: 8ea6c7f
Author: James Peach <jp...@apache.org>
Authored: Mon Sep 2 14:46:21 2013 -0700
Committer: James Peach <jp...@apache.org>
Committed: Mon Sep 2 14:46:21 2013 -0700
----------------------------------------------------------------------
configure.ac | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3fed45cd/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index dfbf2e4..df91e0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -540,6 +540,7 @@ _ts_saved_CXXFLAGS="${CXXFLAGS}"
AC_PROG_CC([cc gcc clang icc])
AC_PROG_CXX([c++ g++ clang++ icpc])
+AM_PROG_CC_C_O
AC_PROG_CPP
AC_PROG_CXXCPP
AM_PROG_AS
[04/21] git commit: ci: build experimental configuration options
Posted by zw...@apache.org.
ci: build experimental configuration options
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/1993bdf0
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/1993bdf0
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/1993bdf0
Branch: refs/heads/5.0.x
Commit: 1993bdf0314696cab9af90ce8ef10dc78ff713bf
Parents: 0ae5897
Author: James Peach <jp...@apache.org>
Authored: Fri Aug 30 10:28:40 2013 -0700
Committer: James Peach <jp...@apache.org>
Committed: Fri Aug 30 10:29:17 2013 -0700
----------------------------------------------------------------------
ci/jenkins/jobs.yaml | 48 ++++++++++++++++++++++++++++++++++++++++-------
1 file changed, 41 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/1993bdf0/ci/jenkins/jobs.yaml
----------------------------------------------------------------------
diff --git a/ci/jenkins/jobs.yaml b/ci/jenkins/jobs.yaml
index f132b40..a2a929c 100644
--- a/ci/jenkins/jobs.yaml
+++ b/ci/jenkins/jobs.yaml
@@ -33,7 +33,7 @@
autoreconf -fi
- shell: |
export DEB_BUILD_HARDENING
- ./configure --prefix="${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}" --enable-experimental-plugins $ENABLE_WCCP $ENABLE_DEBUG
+ ./configure --prefix="${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}" --enable-experimental-plugins $ENABLE_WCCP $ENABLE_DEBUG $ENABLE_EXPERIMENTAL
- shell: make -j2 V=1
- shell: make check
- shell: make install
@@ -54,7 +54,7 @@
export CXX=clang++
export CXXFLAGS="-Qunused-arguments -std=c++11"
export WITH_LIBCPLUSPLUS=yes
- ./configure --prefix="${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}" --enable-experimental-plugins $ENABLE_WCCP $ENABLE_DEBUG
+ ./configure --prefix="${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}" --enable-experimental-plugins $ENABLE_WCCP $ENABLE_DEBUG $ENABLE_EXPERIMENTAL
- shell: make -j2 V=1
- shell: make check
- shell: make install
@@ -98,7 +98,7 @@
export CXXFLAGS=-m64
export CPPFLAGS=-I/opt/omni/include
export LDFLAGS="-L/opt/omni/lib/amd64 -R/opt/omni/lib/amd64"
- ./configure --prefix="${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}" --with-tcl=/opt/omni/lib/amd64 --enable-experimental-plugins $ENABLE_DEBUG
+ ./configure --prefix="${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}" --with-tcl=/opt/omni/lib/amd64 --enable-experimental-plugins $ENABLE_DEBUG $ENABLE_EXPERIMENTAL
- shell: gmake -j2 V=1
- shell: gmake check
- shell: gmake install
@@ -126,6 +126,10 @@
name: DEB_BUILD_HARDENING
default: '{hardening}'
description: enable Debian hardening-wrapper
+ - string:
+ name: ENABLE_EXPERIMENTAL
+ default: '{experimental}'
+ description: enable experimental configure options
scm:
- git:
url: '{repo}'
@@ -153,6 +157,10 @@
name: DEB_BUILD_HARDENING
default: '{hardening}'
description: enable Debian hardening-wrapper
+ - string:
+ name: ENABLE_EXPERIMENTAL
+ default: '{experimental}'
+ description: enable experimental configuration options
scm:
- git:
url: '{repo}'
@@ -169,6 +177,7 @@
wccp: --disable-wccp
debug: --disable-debug
hardening: '0'
+ experimental:
jobs:
- '{node}-{branch}-{tag}-regression':
branch: master
@@ -200,6 +209,7 @@
wccp: --disable-wccp
debug: --disable-debug
hardening: '0'
+ experimental:
jobs:
- '{node}-{branch}-{tag}-regression':
branch: master
@@ -230,6 +240,7 @@
wccp: --enable-wccp
debug: --disable-debug
hardening: '0'
+ experimental:
jobs:
- '{node}-{branch}-{tag}-regression':
branch: master
@@ -251,6 +262,11 @@
- '{node}-{branch}-{tag}-regression':
branch: 4.0.x
repo: file:///home/jenkins/git/trafficserver_4.0
+ - '{node}-{branch}-{tag}-regression':
+ branch: master
+ tag: taobao
+ experimental: --enable-linux-native-aio --enable-reclaimable-freelist --enable-interim-cache
+ repo: file:///home/jenkins/git/trafficserver
- project:
name: centos-6.4-x86
@@ -260,6 +276,7 @@
wccp: --enable-wccp
debug: --disable-debug
hardening: '0'
+ experimental:
jobs:
- '{node}-{branch}-{tag}-regression':
branch: master
@@ -294,6 +311,7 @@
wccp: --enable-wccp
debug: --disable-debug
hardening: '0'
+ experimental:
jobs:
- '{node}-{branch}-{tag}-regression':
branch: master
@@ -328,6 +346,7 @@
wccp: --enable-wccp
debug: --disable-debug
hardening: '0'
+ experimental:
jobs:
- '{node}-{branch}-{tag}-regression':
branch: master
@@ -362,6 +381,7 @@
wccp: --enable-wccp
debug: --disable-debug
hardening: '0'
+ experimental:
jobs:
- '{node}-{branch}-{tag}-regression':
branch: master
@@ -396,6 +416,7 @@
wccp: --enable-wccp
debug: --disable-debug
hardening: '0'
+ experimental:
jobs:
- '{node}-{branch}-{tag}-regression':
branch: master
@@ -430,6 +451,7 @@
wccp: --enable-wccp
debug: --disable-debug
hardening: '0'
+ experimental:
jobs:
- '{node}-{branch}-{tag}-regression':
branch: master
@@ -475,6 +497,7 @@
wccp: --enable-wccp
debug: --disable-debug
hardening: '0'
+ experimental:
jobs:
- '{node}-{branch}-{tag}-regression':
branch: master
@@ -486,19 +509,19 @@
repo: file:///home/jenkins/git/trafficserver
- '{node}-{branch}-{tag}-regression':
branch: 3.2.x
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-{tag}-regression':
branch: 3.2.x
- tag: debug
- debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-{tag}-regression':
branch: 4.0.x
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver_4.0
- '{node}-{branch}-{tag}-regression':
branch: 4.0.x
- tag: debug
- debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver_4.0
- project:
@@ -509,6 +532,7 @@
wccp: --disable-wccp
debug: --disable-debug
hardening: '0'
+ experimental:
jobs:
- '{node}-{branch}-{tag}-regression':
branch: master
@@ -543,6 +567,7 @@
wccp: --disable-wccp
debug: --disable-debug
hardening: '0'
+ experimental:
jobs:
- '{node}-{branch}-{tag}-regression':
branch: master
@@ -577,6 +602,7 @@
wccp: --enable-wccp
debug: --disable-debug
hardening: '0'
+ experimental:
jobs:
- '{node}-{branch}-{tag}-regression':
branch: master
@@ -611,6 +637,7 @@
wccp: --enable-wccp
debug: --disable-debug
hardening: '0'
+ experimental:
jobs:
- '{node}-{branch}-{tag}-regression':
branch: master
@@ -650,6 +677,7 @@
wccp: --enable-wccp
debug: --disable-debug
hardening: '0'
+ experimental:
jobs:
- '{node}-{branch}-{tag}-regression':
branch: master
@@ -680,6 +708,11 @@
tag: debug
debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver_4.0
+ - '{node}-{branch}-{tag}-regression':
+ branch: master
+ tag: taobao
+ experimental: --enable-linux-native-aio --enable-reclaimable-freelist --enable-interim-cache
+ repo: file:///home/jenkins/git/trafficserver
- project:
name: debian-6-x64
@@ -689,6 +722,7 @@
wccp: --enable-wccp
debug: --disable-debug
hardening: '0'
+ experimental:
jobs:
- '{node}-{branch}-{tag}-regression':
branch: master
[13/21] git commit: doc: minor formatting fixes
Posted by zw...@apache.org.
doc: minor formatting fixes
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/2585a31c
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/2585a31c
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/2585a31c
Branch: refs/heads/5.0.x
Commit: 2585a31cf8e0c981e37d0a80a3714bf8e4dcf9cd
Parents: 49e8a7a
Author: James Peach <jp...@apache.org>
Authored: Sun Sep 1 21:00:38 2013 -0700
Committer: James Peach <jp...@apache.org>
Committed: Mon Sep 2 08:13:04 2013 -0700
----------------------------------------------------------------------
doc/admin/faqs.en.rst | 6 +++---
doc/admin/traffic-server-error-messages.en.rst | 6 +++---
doc/reference/api/TSLifecycleHookAdd.en.rst | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2585a31c/doc/admin/faqs.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/faqs.en.rst b/doc/admin/faqs.en.rst
index d8b0894..0fac735 100644
--- a/doc/admin/faqs.en.rst
+++ b/doc/admin/faqs.en.rst
@@ -66,7 +66,7 @@ that sent the request) loads them.
In Squid- and Netscape-format log files, what do the cache result codes mean?
-----------------------------------------------------------------------------
-This is described in detail in the :ref:`log-formats-squid-format`
+This is described in detail in the :ref:`log-formats-squid-format` documentation.
What is recorded by the ``cqtx`` field in a custom log file?
------------------------------------------------------------
@@ -117,12 +117,12 @@ to ``1`` in the :file:`records.config` file.
How do I enable forward proxy mode
----------------------------------
-Please refer to the :ref:`forward-proxy` documentation
+Please refer to the :ref:`forward-proxy` documentation.
How do I interpret the Via: header code?
----------------------------------------
-Take a look at our `Via decoder Ring <http://trafficserver.apache.org/tools/via>`_
+Take a look at our `Via decoder Ring <http://trafficserver.apache.org/tools/via>`_.
Support for HTTP Expect: Header
-------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2585a31c/doc/admin/traffic-server-error-messages.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/traffic-server-error-messages.en.rst b/doc/admin/traffic-server-error-messages.en.rst
index 276f94d..df01cde 100644
--- a/doc/admin/traffic-server-error-messages.en.rst
+++ b/doc/admin/traffic-server-error-messages.en.rst
@@ -55,7 +55,7 @@ Traffic Server Warnings
The specified client is not allowed to connect to Traffic Server;
the client IP address is not listed in the ``ip_allow.config`` file.
-``Could not rename log <filename> to <rolled filename``
+``Could not rename log <filename> to <rolled filename>``
System error when renaming log file during roll.
``Did <this amount> of backup; still to do <remaining amount>``
@@ -143,8 +143,8 @@ Traffic Server returns detailed error messages to browser clients when
there are problems with the HTTP transactions requested by the browser.
These Traffic Server response messages correspond to standard HTTP
response codes, but provide more information. A list of the more
-frequently-encountered HTTP response codes is provided in :ref:`Standard HTTP
-Response Messages`. You can customize the Traffic Server response messages, if desired.
+frequently-encountered HTTP response codes is provided in :ref:`standard-http-response-messages`.
+You can customize the Traffic Server response messages, if desired.
The following table lists the hard-coded Traffic Server HTTP messages,
with corresponding HTTP response codes and customizable files.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2585a31c/doc/reference/api/TSLifecycleHookAdd.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/api/TSLifecycleHookAdd.en.rst b/doc/reference/api/TSLifecycleHookAdd.en.rst
index b546b77..672707c 100644
--- a/doc/reference/api/TSLifecycleHookAdd.en.rst
+++ b/doc/reference/api/TSLifecycleHookAdd.en.rst
@@ -39,7 +39,7 @@ once during the execution of the Traffic Server process and therefore should be
`TS_LIFECYCLE_PORTS_INITIALIZED_HOOK`
Called after the :ts:cv:`proxy server port <proxy.config.http.server_ports>` data structures have been initialized
but before connections are accepted on those ports. The sockets corresponding to the ports may or may not be open
- depending on how the `traffic_server` process was invoked. Other API functions that depend on server ports should be
+ depending on how the :program:`traffic_server` process was invoked. Other API functions that depend on server ports should be
called from this hook and not :func:`TSPluginInit`.
Invoked with the event `TS_EVENT_LIFECYCLE_PORTS_INITIALIZED` and `NULL` data.
@@ -99,7 +99,7 @@ to be initialized and therefore does not work if called from :func:`TSPluginInit
History
=======
-Lifecycle hooks were introduced to solve process initialization ordering issues (TS-1487). Different API calls required
+Lifecycle hooks were introduced to solve process initialization ordering issues (`TS-1487 <https://issues.apache.org/jira/browse/TS-1487>`_). Different API calls required
different modules of Traffic Server to be initialized for the call to work, but others did not work that late in initialization, which was problematic because all of them could effectively only be called from :func:`TSPluginInit` . The
solution was to move :func:`TSPluginInit` as early as possible in the process initialization and provide hooks for API
calls that needed to be invoked later which served essentially as additional pluging initialization points.
[14/21] git commit: TS-2172: Explicitly use subdir-objects in
automake init
Posted by zw...@apache.org.
TS-2172: Explicitly use subdir-objects in automake init
This avoids warnings from automake 1.14 and generates correct configure
script.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/471655ca
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/471655ca
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/471655ca
Branch: refs/heads/5.0.x
Commit: 471655ca1f9469515444decaaa2f81fde0bd5a25
Parents: 2585a31
Author: Li-Wen Hsu <lw...@lwhsu.org>
Authored: Tue Sep 3 01:22:35 2013 +0800
Committer: Yunkai Zhang <qi...@taobao.com>
Committed: Tue Sep 3 02:57:20 2013 +0800
----------------------------------------------------------------------
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/471655ca/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 8765984..dfbf2e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,7 +40,7 @@ AC_PREREQ([2.59])
AC_CONFIG_AUX_DIR([build/aux])
AC_CONFIG_SRCDIR([proxy/Main.cc])
AC_CONFIG_MACRO_DIR([build])
-AM_INIT_AUTOMAKE([-Wall -Werror tar-ustar foreign no-installinfo no-installman 1.9.2])
+AM_INIT_AUTOMAKE([-Wall -Werror tar-ustar foreign no-installinfo no-installman subdir-objects 1.9.2])
AC_CONFIG_HEADERS([lib/ts/ink_autoconf.h])
# Configure with --disable-silent-rules to get verbose output. For more info, see
[10/21] git commit: ci: fix experimental tag substitution
Posted by zw...@apache.org.
ci: fix experimental tag substitution
jenkins-job-builder emits 'None' for a missing key, so the configure
line was ending up as:
./configure --enable-experimental-plugins --enable-wccp --enable-debug None
Replace it with an empty string instead.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/0e4b5fed
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/0e4b5fed
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/0e4b5fed
Branch: refs/heads/5.0.x
Commit: 0e4b5fede175481d5a8ee6fbf7cfbd064f51be2f
Parents: 372d46a
Author: James Peach <jp...@apache.org>
Authored: Fri Aug 30 14:32:44 2013 -0700
Committer: James Peach <jp...@apache.org>
Committed: Sat Aug 31 10:20:50 2013 -0700
----------------------------------------------------------------------
ci/jenkins/jobs.yaml | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0e4b5fed/ci/jenkins/jobs.yaml
----------------------------------------------------------------------
diff --git a/ci/jenkins/jobs.yaml b/ci/jenkins/jobs.yaml
index a2a929c..148b67d 100644
--- a/ci/jenkins/jobs.yaml
+++ b/ci/jenkins/jobs.yaml
@@ -177,7 +177,7 @@
wccp: --disable-wccp
debug: --disable-debug
hardening: '0'
- experimental:
+ experimental: ''
jobs:
- '{node}-{branch}-{tag}-regression':
branch: master
@@ -209,7 +209,7 @@
wccp: --disable-wccp
debug: --disable-debug
hardening: '0'
- experimental:
+ experimental: ''
jobs:
- '{node}-{branch}-{tag}-regression':
branch: master
@@ -240,7 +240,7 @@
wccp: --enable-wccp
debug: --disable-debug
hardening: '0'
- experimental:
+ experimental: ''
jobs:
- '{node}-{branch}-{tag}-regression':
branch: master
@@ -276,7 +276,7 @@
wccp: --enable-wccp
debug: --disable-debug
hardening: '0'
- experimental:
+ experimental: ''
jobs:
- '{node}-{branch}-{tag}-regression':
branch: master
@@ -311,7 +311,7 @@
wccp: --enable-wccp
debug: --disable-debug
hardening: '0'
- experimental:
+ experimental: ''
jobs:
- '{node}-{branch}-{tag}-regression':
branch: master
@@ -346,7 +346,7 @@
wccp: --enable-wccp
debug: --disable-debug
hardening: '0'
- experimental:
+ experimental: ''
jobs:
- '{node}-{branch}-{tag}-regression':
branch: master
@@ -381,7 +381,7 @@
wccp: --enable-wccp
debug: --disable-debug
hardening: '0'
- experimental:
+ experimental: ''
jobs:
- '{node}-{branch}-{tag}-regression':
branch: master
@@ -416,7 +416,7 @@
wccp: --enable-wccp
debug: --disable-debug
hardening: '0'
- experimental:
+ experimental: ''
jobs:
- '{node}-{branch}-{tag}-regression':
branch: master
@@ -451,7 +451,7 @@
wccp: --enable-wccp
debug: --disable-debug
hardening: '0'
- experimental:
+ experimental: ''
jobs:
- '{node}-{branch}-{tag}-regression':
branch: master
@@ -497,7 +497,7 @@
wccp: --enable-wccp
debug: --disable-debug
hardening: '0'
- experimental:
+ experimental: ''
jobs:
- '{node}-{branch}-{tag}-regression':
branch: master
@@ -532,7 +532,7 @@
wccp: --disable-wccp
debug: --disable-debug
hardening: '0'
- experimental:
+ experimental: ''
jobs:
- '{node}-{branch}-{tag}-regression':
branch: master
@@ -567,7 +567,7 @@
wccp: --disable-wccp
debug: --disable-debug
hardening: '0'
- experimental:
+ experimental: ''
jobs:
- '{node}-{branch}-{tag}-regression':
branch: master
@@ -602,7 +602,7 @@
wccp: --enable-wccp
debug: --disable-debug
hardening: '0'
- experimental:
+ experimental: ''
jobs:
- '{node}-{branch}-{tag}-regression':
branch: master
@@ -637,7 +637,7 @@
wccp: --enable-wccp
debug: --disable-debug
hardening: '0'
- experimental:
+ experimental: ''
jobs:
- '{node}-{branch}-{tag}-regression':
branch: master
@@ -677,7 +677,7 @@
wccp: --enable-wccp
debug: --disable-debug
hardening: '0'
- experimental:
+ experimental: ''
jobs:
- '{node}-{branch}-{tag}-regression':
branch: master
@@ -722,7 +722,7 @@
wccp: --enable-wccp
debug: --disable-debug
hardening: '0'
- experimental:
+ experimental: ''
jobs:
- '{node}-{branch}-{tag}-regression':
branch: master
[21/21] git commit: Merge branch 'master' into 5.0.x
Posted by zw...@apache.org.
Merge branch 'master' into 5.0.x
* master:
ci: test make distclean in jenkins
ci: fix debug jobs for centos5
TS-2174: Fix StatBinaryEval() on div operation
TS-2173: RECD_COUNTER type is missing in setTokenValue()
TS-2172: automake subdir-objects requires AM_PROG_CC_C_O
sdk docs: fix links & formatting in preface
TS-2172: Explicitly use subdir-objects in automake init
doc: minor formatting fixes
TS-2165: Introduce cluster-wide logging stats
finishing up the cleanup of the admin guide
ci: shrink builders pollng period
ci: fix experimental tag substitution
Fix the 4.0.1 relase
added TS-2167
TS-2167: Update apichecker.pl to give suggestions on additional deprecated APIs
Doc: Add transaction buffering control.
ci: build experimental configuration options
ci: reduce the number of job templates
Add debug builds for 3.2.x and 4.0.x in the CI
Fix git paths for the 4.0.x branch in Jenkins
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/9aad786e
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/9aad786e
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/9aad786e
Branch: refs/heads/5.0.x
Commit: 9aad786e82fc13c17fce88959a4cfc80286212f1
Parents: a75ebb6 b450c84
Author: Leif Hedstrom <zw...@apache.org>
Authored: Tue Sep 3 20:26:52 2013 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Tue Sep 3 20:26:52 2013 -0600
----------------------------------------------------------------------
CHANGES | 7 +
STATUS | 2 +-
ci/jenkins/jobs.yaml | 535 ++++++++++++++-----
configure.ac | 3 +-
doc/admin/event-logging-formats.en.rst | 10 +-
doc/admin/faqs.en.rst | 105 ++--
doc/admin/http-proxy-caching.en.rst | 80 ++-
doc/admin/traffic-server-error-messages.en.rst | 155 +++---
doc/admin/working-log-files.en.rst | 49 +-
doc/admin/working-log-files/log-formats.en.rst | 4 +-
doc/glossary.en.rst | 5 +
.../api/TSHttpOverridableConfig.en.rst | 70 +++
doc/reference/api/TSLifecycleHookAdd.en.rst | 28 +-
doc/reference/api/TSTypes.en.rst | 16 +-
doc/reference/api/index.en.rst | 1 +
.../configuration/logs_xml.config.en.rst | 2 +
.../configuration/records.config.en.rst | 42 +-
doc/sdk/getting-started.en.rst | 2 +
doc/sdk/header-based-plugin-examples.en.rst | 2 +
.../how-to-create-trafficserver-plugins.en.rst | 2 +
doc/sdk/http-transformation-plugin.en.rst | 8 +-
doc/sdk/index.en.rst | 4 +
doc/sdk/new-protocol-plugins.en.rst | 2 +
doc/sdk/preface.en.rst | 16 +-
mgmt/RecordsConfig.cc | 110 ++++
mgmt/stats/StatType.cc | 17 +
proxy/config/stats.config.xml.default | 156 ++++++
proxy/logging/Log.cc | 16 +-
proxy/logging/LogConfig.cc | 24 +-
proxy/logging/LogConfig.h | 6 +
proxy/logging/LogFile.cc | 11 +-
proxy/logging/LogHost.cc | 8 +
proxy/logging/LogObject.cc | 3 +
tools/apichecker.pl | 179 ++++++-
34 files changed, 1296 insertions(+), 384 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9aad786e/CHANGES
----------------------------------------------------------------------
diff --cc CHANGES
index 920a2c4,455bdcf..03d1713
--- a/CHANGES
+++ b/CHANGES
@@@ -1,12 -1,13 +1,19 @@@
-*- coding: utf-8 -*-
+Changes with Apache Traffic Server 5.0.0
+
+ *) [TS-1919] Eliminate CacheLookupHttpConfig. This breaks cluster
+ compatibility, so all cluster nodes should be upgraded simultaneously.
+
+
Changes with Apache Traffic Server 4.1.0
+ *) [TS-2173] RECD_COUNTER type is missing in setTokenValue()
+
+ *) [TS-2165] Introduce cluster-wide logging stats
+
+ *) [TS-2167] Update apichecker.pl to give suggestions on additional
+ deprecated APIs
+
*) [TS-2163] Remove WDA_BILLING, ACC_ALARMS etc. code and definitions.
*) [TS-2156] Fix stats trap in different type of threads
[03/21] git commit: ci: reduce the number of job templates
Posted by zw...@apache.org.
ci: reduce the number of job templates
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/0ae58970
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/0ae58970
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/0ae58970
Branch: refs/heads/5.0.x
Commit: 0ae58970e40e3ba9b072c37011b9ed4e15985257
Parents: 391e6be
Author: James Peach <jp...@apache.org>
Authored: Fri Aug 30 09:56:10 2013 -0700
Committer: James Peach <jp...@apache.org>
Committed: Fri Aug 30 10:29:10 2013 -0700
----------------------------------------------------------------------
ci/jenkins/jobs.yaml | 414 +++++++++++++++++++++++++++++-----------------
1 file changed, 258 insertions(+), 156 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0ae58970/ci/jenkins/jobs.yaml
----------------------------------------------------------------------
diff --git a/ci/jenkins/jobs.yaml b/ci/jenkins/jobs.yaml
index afe00f8..f132b40 100644
--- a/ci/jenkins/jobs.yaml
+++ b/ci/jenkins/jobs.yaml
@@ -108,56 +108,24 @@
rm -rf "${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}"
- job-template:
- name: '{node}-{branch}-regression'
- node: '{node}'
- parameters:
- - string:
- name: ENABLE_WCCP
- default: '{wccp}'
- description: enable WCCP support
- scm:
- - git:
- url: '{repo}'
- branches:
- - '{branch}'
- builders:
- - '{builder}-regression'
-
-- job-template:
- name: '{node}-{branch}-debug-regression'
+ name: '{node}-{branch}-{tag}-regression'
node: '{node}'
parameters:
- string:
name: ENABLE_DEBUG
- default: --enable-debug
+ default: '{debug}'
description: enable runtime debug checks
- string:
name: ENABLE_WCCP
default: '{wccp}'
description: enable WCCP support
- scm:
- - git:
- url: '{repo}'
- branches:
- - '{branch}'
- builders:
- - '{builder}-regression'
-
-# Standard regression tests with Debian build hardening compiler flags.
-# See https://wiki.ubuntu.com/Security/HardeningWrapper
-# and https://wiki.debian.org/Hardening.
-- job-template:
- name: '{node}-{branch}-hardening-regression'
- node: '{node}'
- parameters:
- string:
+ # Standard regression tests with Debian build hardening compiler flags.
+ # See https://wiki.ubuntu.com/Security/HardeningWrapper
+ # and https://wiki.debian.org/Hardening.
name: DEB_BUILD_HARDENING
- default: '1'
+ default: '{hardening}'
description: enable Debian hardening-wrapper
- - string:
- name: ENABLE_WCCP
- default: '{wccp}'
- description: enable WCCP support
scm:
- git:
url: '{repo}'
@@ -167,33 +135,24 @@
- '{builder}-regression'
- job-template:
- name: '{node}-{branch}-clang-regression'
- node: '{node}'
- parameters:
- - string:
- name: ENABLE_WCCP
- default: '{wccp}'
- description: enable WCCP support
- scm:
- - git:
- url: '{repo}'
- branches:
- - '{branch}'
- builders:
- - '{builder}-clang-regression'
-
-- job-template:
- name: '{node}-{branch}-clang-debug-regression'
+ name: '{node}-{branch}-clang-{tag}-regression'
node: '{node}'
parameters:
- string:
name: ENABLE_DEBUG
- default: --enable-debug
+ default: '{debug}'
description: enable runtime debug checks
- string:
name: ENABLE_WCCP
default: '{wccp}'
description: enable WCCP support
+ - string:
+ # Standard regression tests with Debian build hardening compiler flags.
+ # See https://wiki.ubuntu.com/Security/HardeningWrapper
+ # and https://wiki.debian.org/Hardening.
+ name: DEB_BUILD_HARDENING
+ default: '{hardening}'
+ description: enable Debian hardening-wrapper
scm:
- git:
url: '{repo}'
@@ -206,24 +165,29 @@
name: centos-5-x64
node: centos_5_x64
builder: linux
+ tag: normal
wccp: --disable-wccp
+ debug: --disable-debug
+ hardening: '0'
jobs:
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: master
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: master
repo: file:///home/jenkins/git/trafficserver
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 3.2.x
repo: file:///home/jenkins/git/trafficserver_3.2
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 3.2.x
repo: file:///home/jenkins/git/trafficserver_3.2
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 4.0.x
repo: file:///home/jenkins/git/trafficserver_4.0
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 4.0.x
repo: file:///home/jenkins/git/trafficserver_4.0
@@ -232,24 +196,29 @@
name: centos-5-x86
node: centos_5_x86
builder: linux
+ tag: normal
wccp: --disable-wccp
+ debug: --disable-debug
+ hardening: '0'
jobs:
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: master
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: master
repo: file:///home/jenkins/git/trafficserver
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 3.2.x
repo: file:///home/jenkins/git/trafficserver_3.2
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 3.2.x
repo: file:///home/jenkins/git/trafficserver_3.2
- '{node}-{branch}-regression':
branch: 4.0.x
repo: file:///home/jenkins/git/trafficserver_4.0
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 4.0.x
repo: file:///home/jenkins/git/trafficserver_4.0
@@ -257,24 +226,29 @@
name: centos-6.4-x64
node: centos_6.4_x64
builder: linux
+ tag: normal
wccp: --enable-wccp
+ debug: --disable-debug
+ hardening: '0'
jobs:
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: master
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: master
repo: file:///home/jenkins/git/trafficserver
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 3.2.x
repo: file:///home/jenkins/git/trafficserver_3.2
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 3.2.x
repo: file:///home/jenkins/git/trafficserver_3.2
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 4.0.x
repo: file:///home/jenkins/git/trafficserver_4.0
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 4.0.x
repo: file:///home/jenkins/git/trafficserver_4.0
@@ -282,24 +256,33 @@
name: centos-6.4-x86
node: centos_6.4_x86
builder: linux
+ tag: normal
wccp: --enable-wccp
+ debug: --disable-debug
+ hardening: '0'
jobs:
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: master
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: master
repo: file:///home/jenkins/git/trafficserver
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 3.2.x
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver_3.2
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 3.2.x
repo: file:///home/jenkins/git/trafficserver_3.2
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 4.0.x
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver_4.0
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 4.0.x
repo: file:///home/jenkins/git/trafficserver_4.0
@@ -307,24 +290,33 @@
name: fedora-15-x64
node: fedora_15_x64
builder: linux
+ tag: normal
wccp: --enable-wccp
+ debug: --disable-debug
+ hardening: '0'
jobs:
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: master
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: master
repo: file:///home/jenkins/git/trafficserver
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 3.2.x
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver_3.2
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 3.2.x
repo: file:///home/jenkins/git/trafficserver_3.2
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 4.0.x
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver_4.0
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 4.0.x
repo: file:///home/jenkins/git/trafficserver_4.0
@@ -332,24 +324,33 @@
name: fedora-15-x86
node: fedora_15_x86
builder: linux
+ tag: normal
wccp: --enable-wccp
+ debug: --disable-debug
+ hardening: '0'
jobs:
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: master
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: master
repo: file:///home/jenkins/git/trafficserver
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 3.2.x
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver_3.2
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 3.2.x
repo: file:///home/jenkins/git/trafficserver_3.2
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 4.0.x
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver_4.0
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 4.0.x
repo: file:///home/jenkins/git/trafficserver_4.0
@@ -357,24 +358,33 @@
name: fedora-18-x64
node: fedora_18_x64
builder: linux
+ tag: normal
wccp: --enable-wccp
+ debug: --disable-debug
+ hardening: '0'
jobs:
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: master
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: master
repo: file:///home/jenkins/git/trafficserver
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 3.2.x
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver_3.2
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 3.2.x
repo: file:///home/jenkins/git/trafficserver_3.2
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 4.0.x
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver_4.0
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 4.0.x
repo: file:///home/jenkins/git/trafficserver_4.0
@@ -382,24 +392,33 @@
name: fedora-18-x86
node: fedora_18_x86
builder: linux
+ tag: normal
wccp: --enable-wccp
+ debug: --disable-debug
+ hardening: '0'
jobs:
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: master
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: master
repo: file:///home/jenkins/git/trafficserver
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 3.2.x
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver_3.2
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 3.2.x
repo: file:///home/jenkins/git/trafficserver_3.2
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 4.0.x
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver_4.0
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 4.0.x
repo: file:///home/jenkins/git/trafficserver_4.0
@@ -407,215 +426,298 @@
name: fedora-rawhide-x64
node: fedora_rawhide_x64
builder: linux
+ tag: normal
wccp: --enable-wccp
+ debug: --disable-debug
+ hardening: '0'
jobs:
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: master
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: master
repo: file:///home/jenkins/git/trafficserver
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 3.2.x
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver_3.2
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 3.2.x
repo: file:///home/jenkins/git/trafficserver_3.2
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 4.0.x
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver_4.0
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 4.0.x
repo: file:///home/jenkins/git/trafficserver_4.0
- - '{node}-{branch}-clang-regression':
+ - '{node}-{branch}-clang-{tag}-regression':
branch: master
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver
- - '{node}-{branch}-clang-debug-regression':
+ - '{node}-{branch}-clang-{tag}-regression':
branch: master
repo: file:///home/jenkins/git/trafficserver
+ - '{node}-{branch}-clang-{tag}-regression':
+ branch: 4.0.x
+ repo: file:///home/jenkins/git/trafficserver_4.0
- project:
name: fedora-rawhide-x86
node: fedora_rawhide_x86
builder: linux
+ tag: normal
wccp: --enable-wccp
+ debug: --disable-debug
+ hardening: '0'
jobs:
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: master
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: master
repo: file:///home/jenkins/git/trafficserver
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 3.2.x
repo: file:///home/jenkins/git/trafficserver_3.2
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 3.2.x
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver_3.2
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 4.0.x
repo: file:///home/jenkins/git/trafficserver_4.0
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 4.0.x
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver_4.0
- project:
name: freebsd-9.1-x64
node: freebsd_9.1_x64
builder: bsd
+ tag: normal
wccp: --disable-wccp
+ debug: --disable-debug
+ hardening: '0'
jobs:
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: master
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: master
repo: file:///home/jenkins/git/trafficserver
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 3.2.x
repo: file:///home/jenkins/git/trafficserver_3.2
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 3.2.x
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver_3.2
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 4.0.x
repo: file:///home/jenkins/git/trafficserver_4.0
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 4.0.x
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver_4.0
- project:
name: omnios-x64
node: omnios_x64
builder: omnios
+ tag: normal
wccp: --disable-wccp
+ debug: --disable-debug
+ hardening: '0'
jobs:
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: master
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: master
repo: file:///home/jenkins/git/trafficserver
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 3.2.x
repo: file:///home/jenkins/git/trafficserver_3.2
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 3.2.x
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver_3.2
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 4.0.x
repo: file:///home/jenkins/git/trafficserver_4.0
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 4.0.x
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver_4.0
- project:
name: opensuse-12-x64
node: opensuse_12_x64
builder: linux
+ tag: normal
wccp: --enable-wccp
+ debug: --disable-debug
+ hardening: '0'
jobs:
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: master
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: master
repo: file:///home/jenkins/git/trafficserver
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 3.2.x
repo: file:///home/jenkins/git/trafficserver_3.2
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 3.2.x
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver_3.2
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 4.0.x
repo: file:///home/jenkins/git/trafficserver_4.0
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 4.0.x
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver_4.0
- project:
name: ubuntu-10.04-x64
node: ubuntu_10.04_x64
builder: linux
+ tag: normal
wccp: --enable-wccp
+ debug: --disable-debug
+ hardening: '0'
jobs:
- - '{node}-{branch}-hardening-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: master
+ tag: hardening
+ hardening: '1'
repo: file:///home/jenkins/git/trafficserver
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: master
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: master
repo: file:///home/jenkins/git/trafficserver
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 3.2.x
repo: file:///home/jenkins/git/trafficserver_3.2
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 3.2.x
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver_3.2
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 4.0.x
repo: file:///home/jenkins/git/trafficserver_4.0
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 4.0.x
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver_4.0
- project:
name: ubuntu-12.04-x64
node: ubuntu_12.04_x64
builder: linux
+ tag: normal
wccp: --enable-wccp
+ debug: --disable-debug
+ hardening: '0'
jobs:
- - '{node}-{branch}-hardening-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: master
+ tag: hardening
+ hardening: '0'
repo: file:///home/jenkins/git/trafficserver
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: master
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: master
repo: file:///home/jenkins/git/trafficserver
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 3.2.x
repo: file:///home/jenkins/git/trafficserver_3.2
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 3.2.x
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver_3.2
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 4.0.x
repo: file:///home/jenkins/git/trafficserver_4.0
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 4.0.x
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver_4.0
- project:
name: debian-6-x64
node: debian_6_x64
builder: linux
+ tag: normal
wccp: --enable-wccp
+ debug: --disable-debug
+ hardening: '0'
jobs:
- - '{node}-{branch}-hardening-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: master
+ tag: hardening
+ hardening: '1'
repo: file:///home/jenkins/git/trafficserver
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: master
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: master
repo: file:///home/jenkins/git/trafficserver
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 3.2.x
repo: file:///home/jenkins/git/trafficserver_3.2
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 3.2.x
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver_3.2
- - '{node}-{branch}-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 4.0.x
repo: file:///home/jenkins/git/trafficserver_4.0
- - '{node}-{branch}-debug-regression':
+ - '{node}-{branch}-{tag}-regression':
branch: 4.0.x
+ tag: debug
+ debug: --enable-debug
repo: file:///home/jenkins/git/trafficserver_4.0
# vim: sw=4 ts=4 et ft=yaml :
[15/21] git commit: sdk docs: fix links & formatting in preface
Posted by zw...@apache.org.
sdk docs: fix links & formatting in preface
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/8ea6c7f3
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/8ea6c7f3
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/8ea6c7f3
Branch: refs/heads/5.0.x
Commit: 8ea6c7f3acfde87216c81c3c8a3d278bfe078231
Parents: 471655c
Author: Igor Galić <i....@brainsware.org>
Authored: Mon Sep 2 21:38:11 2013 +0200
Committer: Igor Galić <i....@brainsware.org>
Committed: Mon Sep 2 21:38:11 2013 +0200
----------------------------------------------------------------------
doc/sdk/getting-started.en.rst | 2 ++
doc/sdk/header-based-plugin-examples.en.rst | 2 ++
doc/sdk/how-to-create-trafficserver-plugins.en.rst | 2 ++
doc/sdk/http-transformation-plugin.en.rst | 2 +-
doc/sdk/index.en.rst | 4 ++++
doc/sdk/new-protocol-plugins.en.rst | 2 ++
doc/sdk/preface.en.rst | 16 +++++++---------
7 files changed, 20 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8ea6c7f3/doc/sdk/getting-started.en.rst
----------------------------------------------------------------------
diff --git a/doc/sdk/getting-started.en.rst b/doc/sdk/getting-started.en.rst
index aa1535b..a39d0cf 100644
--- a/doc/sdk/getting-started.en.rst
+++ b/doc/sdk/getting-started.en.rst
@@ -1,3 +1,5 @@
+.. _sdk-getting-started:
+
Getting Started
***************
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8ea6c7f3/doc/sdk/header-based-plugin-examples.en.rst
----------------------------------------------------------------------
diff --git a/doc/sdk/header-based-plugin-examples.en.rst b/doc/sdk/header-based-plugin-examples.en.rst
index beb30db..2b28300 100644
--- a/doc/sdk/header-based-plugin-examples.en.rst
+++ b/doc/sdk/header-based-plugin-examples.en.rst
@@ -1,3 +1,5 @@
+.. _header-based-plugin-examples:
+
Header-Based Plugin Examples
*****************************
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8ea6c7f3/doc/sdk/how-to-create-trafficserver-plugins.en.rst
----------------------------------------------------------------------
diff --git a/doc/sdk/how-to-create-trafficserver-plugins.en.rst b/doc/sdk/how-to-create-trafficserver-plugins.en.rst
index 55c69da..9e7a11c 100644
--- a/doc/sdk/how-to-create-trafficserver-plugins.en.rst
+++ b/doc/sdk/how-to-create-trafficserver-plugins.en.rst
@@ -1,3 +1,5 @@
+.. _how-to-create-traffic-server-plugins:
+
How to Create Traffic Server Plugins
************************************
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8ea6c7f3/doc/sdk/http-transformation-plugin.en.rst
----------------------------------------------------------------------
diff --git a/doc/sdk/http-transformation-plugin.en.rst b/doc/sdk/http-transformation-plugin.en.rst
index b7acfe1..b78b5f6 100644
--- a/doc/sdk/http-transformation-plugin.en.rst
+++ b/doc/sdk/http-transformation-plugin.en.rst
@@ -1,4 +1,4 @@
-.. _transform-plugin:
+.. _http-transformation-plugin:
HTTP Transformation Plugins
***************************
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8ea6c7f3/doc/sdk/index.en.rst
----------------------------------------------------------------------
diff --git a/doc/sdk/index.en.rst b/doc/sdk/index.en.rst
index cab4d0c..54e5fef 100644
--- a/doc/sdk/index.en.rst
+++ b/doc/sdk/index.en.rst
@@ -1,3 +1,5 @@
+.. _programmers-guide:
+
Programmers' Guide
******************
@@ -34,6 +36,8 @@ supported different operating systems and more functions than the
current version. As a result, some of the sections may refer to
functionality that no longer exists.
+.. These links need fixing..
+
If you find any such issues, you may want to submit a `bug or a
patch <https://issues.apache.org/jira/secure/CreateIssue!default.jspa?pid=12310963>`__.
Or find out how to `find bugs <>`__, `create useful bug reports <>`__ or
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8ea6c7f3/doc/sdk/new-protocol-plugins.en.rst
----------------------------------------------------------------------
diff --git a/doc/sdk/new-protocol-plugins.en.rst b/doc/sdk/new-protocol-plugins.en.rst
index 7b325a7..13614a5 100644
--- a/doc/sdk/new-protocol-plugins.en.rst
+++ b/doc/sdk/new-protocol-plugins.en.rst
@@ -1,3 +1,5 @@
+.. _new-protocol-plugins:
+
New Protocol Plugins
********************
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8ea6c7f3/doc/sdk/preface.en.rst
----------------------------------------------------------------------
diff --git a/doc/sdk/preface.en.rst b/doc/sdk/preface.en.rst
index b7f6e93..2c18876 100644
--- a/doc/sdk/preface.en.rst
+++ b/doc/sdk/preface.en.rst
@@ -1,3 +1,5 @@
+.. _sdk-preface:
+
Preface
********
@@ -28,16 +30,12 @@ The *Traffic Server Software Developer's Kit* is a reference for
creating plugins. **Plugins** are programs that add services (such as
filtering or content transformation) or entire features (such as new
protocol support) to Traffic Server. If you are new to writing Traffic
-Server plugins, then read the first two chapters, `Getting
-Started <../getting-started>`__ and `Creating Traffic Server
-Plugins <../how-to-create-trafficserver-plugins>`__, and use the
-remaining chapters as needed. `Header-Based Plugin
-Examples <../header-based-plugin-examples>`__ provides details about
-plugins that work on HTTP headers, while `HTTP Transformation
-Plugins <../http-transformation-plugin>`__ explains how to write a
+Server plugins, then read the first two chapters, :ref:`sdk-getting-started`
+and :ref:`how-to-create-to-create-trafficserver-plugins`, and use the
+remaining chapters as needed. :ref:`header-based-plugin-examples` provides details about
+plugins that work on HTTP headers, while :ref:`http-transformation-plugin` explains how to write a
plugin that transforms or scans the body of an HTTP response. If you
-want to support your own protocol on Traffic Server, then reference `New
-Protocol Plugins <../new-protocol-plugins>`__.
+want to support your own protocol on Traffic Server, then reference :ref:`new-protocol-plugins`.
Audience
--------
[18/21] git commit: TS-2174: Fix StatBinaryEval() on div operation
Posted by zw...@apache.org.
TS-2174: Fix StatBinaryEval() on div operation
We should fore the type of result to be RecFloat on div operation,
otherwise we can't get the fraction when dividing two RecInt.
Signed-off-by: Yunkai Zhang <qi...@taobao.com>
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/04e16af6
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/04e16af6
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/04e16af6
Branch: refs/heads/5.0.x
Commit: 04e16af6dacb697ddcc373b046a7a412786caddc
Parents: 8d95ab2
Author: Yunkai Zhang <qi...@taobao.com>
Authored: Wed Sep 4 00:57:07 2013 +0800
Committer: Yunkai Zhang <qi...@taobao.com>
Committed: Wed Sep 4 02:29:06 2013 +0800
----------------------------------------------------------------------
mgmt/stats/StatType.cc | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/04e16af6/mgmt/stats/StatType.cc
----------------------------------------------------------------------
diff --git a/mgmt/stats/StatType.cc b/mgmt/stats/StatType.cc
index 0017e5d..3e13d78 100644
--- a/mgmt/stats/StatType.cc
+++ b/mgmt/stats/StatType.cc
@@ -947,6 +947,22 @@ StatExprToken *StatObject::StatBinaryEval(StatExprToken * left, char op,
case '/':
RecData recTmp;
RecDataClear(RECD_NULL, &recTmp);
+
+ /*
+ * Force the type of result to be RecFloat on div operation
+ */
+ if (result->m_token_type != RECD_FLOAT && result->m_token_type != RECD_CONST) {
+ RecFloat t;
+
+ result->m_token_type = RECD_FLOAT;
+
+ t = (RecFloat)l.rec_int;
+ l.rec_float = t;
+
+ t = (RecFloat)r.rec_int;
+ r.rec_float = t;
+ }
+
if (RecDataCmp(result->m_token_type, r, recTmp)) {
result->m_token_value = RecDataDiv(result->m_token_type, l, r);
}
[17/21] git commit: TS-2173: RECD_COUNTER type is missing in
setTokenValue()
Posted by zw...@apache.org.
TS-2173: RECD_COUNTER type is missing in setTokenValue()
After applied "TS-1740: Improve precision of stats values" patch,
each token will keep its original type instead of forcing to RecFloat.
So we should update setTokenValue() to deal with RECD_COUNTER case.
Signed-off-by: Yunkai Zhang <qi...@taobao.com>
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/8d95ab2f
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/8d95ab2f
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/8d95ab2f
Branch: refs/heads/5.0.x
Commit: 8d95ab2f08842e6447b9617f0ad73a8d64ab3d7b
Parents: 3fed45c
Author: Yunkai Zhang <qi...@taobao.com>
Authored: Tue Sep 3 15:29:51 2013 +0800
Committer: Yunkai Zhang <qi...@taobao.com>
Committed: Tue Sep 3 16:12:55 2013 +0800
----------------------------------------------------------------------
CHANGES | 2 ++
mgmt/stats/StatType.cc | 1 +
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8d95ab2f/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 5a80c2f..455bdcf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 4.1.0
+ *) [TS-2173] RECD_COUNTER type is missing in setTokenValue()
+
*) [TS-2165] Introduce cluster-wide logging stats
*) [TS-2167] Update apichecker.pl to give suggestions on additional
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8d95ab2f/mgmt/stats/StatType.cc
----------------------------------------------------------------------
diff --git a/mgmt/stats/StatType.cc b/mgmt/stats/StatType.cc
index 822d9f6..0017e5d 100644
--- a/mgmt/stats/StatType.cc
+++ b/mgmt/stats/StatType.cc
@@ -811,6 +811,7 @@ StatObject::setTokenValue(StatExprToken * token, bool cluster)
break;
case RECD_INT: // fallthought
+ case RECD_COUNTER:
case RECD_FLOAT:
if (cluster) {
if (!overviewGenerator->varClusterDataFromName(token->m_token_type,
[05/21] git commit: Doc: Add transaction buffering control.
Posted by zw...@apache.org.
Doc: Add transaction buffering control.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/bb50292e
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/bb50292e
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/bb50292e
Branch: refs/heads/5.0.x
Commit: bb50292e09f5a3b422b2aee20fb8401e64835c9b
Parents: 1993bdf
Author: Alan M. Carroll <am...@network-geographics.com>
Authored: Fri Aug 30 15:27:56 2013 -0500
Committer: Alan M. Carroll <am...@network-geographics.com>
Committed: Fri Aug 30 15:27:56 2013 -0500
----------------------------------------------------------------------
doc/admin/http-proxy-caching.en.rst | 80 +++++++++++++++-----
doc/glossary.en.rst | 5 ++
.../api/TSHttpOverridableConfig.en.rst | 70 +++++++++++++++++
doc/reference/api/TSLifecycleHookAdd.en.rst | 26 ++++---
doc/reference/api/TSTypes.en.rst | 16 +++-
doc/reference/api/index.en.rst | 1 +
.../configuration/records.config.en.rst | 42 +++++++---
doc/sdk/http-transformation-plugin.en.rst | 8 +-
8 files changed, 204 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bb50292e/doc/admin/http-proxy-caching.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/http-proxy-caching.en.rst b/doc/admin/http-proxy-caching.en.rst
index 2f5de11..1e60bb1 100644
--- a/doc/admin/http-proxy-caching.en.rst
+++ b/doc/admin/http-proxy-caching.en.rst
@@ -5,20 +5,20 @@ HTTP Proxy Caching
.. Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
Web proxy caching enables you to store copies of frequently-accessed web
objects (such as documents, images, and articles) and then serve this
@@ -59,7 +59,7 @@ overview illustrates how Traffic Server serves a request.
4. If the data in the cache is stale, then Traffic Server connects to
the origin server and checks if the object is still fresh (a
- **revalidation**). If it is, then Traffic Server immediately sends
+ :term:`revalidation`). If it is, then Traffic Server immediately sends
the cached copy to the client.
5. If the object is not in the cache (a **cache miss**) or if the server
@@ -353,9 +353,9 @@ To configure the Force Immediate Update option
.. important::
- When you enable the Force Immediate Update option, Traffic Server continually updates the URLs specified in :file:`update.config`
- until you disable the option. To disable the Force Immediate Update option, set :ts:cv:`proxy.config.update.force` to ``0``
- (zero).
+ When you enable the Force Immediate Update option, Traffic Server continually updates the URLs specified in
+ :file:`update.config` until you disable the option. To disable the Force Immediate Update option, set
+ :ts:cv:`proxy.config.update.force` to ``0`` (zero).
Pushing Content into the Cache
==============================
@@ -402,7 +402,8 @@ place in the cache. The following is an example of a ``PUSH`` request::
.. important::
- Your header must include ``Content-length`` - ``Content-length`` must include both ``header`` and ``body byte count``.
+ Your header must include ``Content-length`` - ``Content-length`` must include both ``header`` and ``body byte
+ count``.
Tools that will help manage pushing
-----------------------------------
@@ -521,7 +522,7 @@ By default, Traffic Server strictly observes ``Cache-Control: no-cache``
directives. A response from an origin server with a ``no-cache`` header
is not stored in the cache and any previous copy of the object in the
cache is removed. If you configure Traffic Server to ignore ``no-cache``
-headers, then Traffic Server also ignores ``no-store`` headers. The
+headers, then Traffic Server also ignores ``no-store`` headers. The
efault behavior of observing ``no-cache`` directives is appropriate
in most cases.
@@ -731,3 +732,44 @@ tasks:
#. Run the command :option:`traffic_line -x` to apply the configuration
changes.
+.. _transaction-buffering-control:
+
+Using Transaction Buffering Control
+===================================
+
+By default I/O operations are run at full speed, as fast as either Traffic Server, the network, or the cache can go.
+This can be problematic for large objects if the client side connection is significantly slower. In such cases the
+content will be buffered in ram while waiting to be sent to the client. This could potentially also happen for ``POST``
+requests if the client connection is fast and the origin server connection slow. If very large objects are being used
+this can cause the memory usage of Traffic Server to become `very large
+<https://issues.apache.org/jira/browse/TS-1496>`_.
+
+This problem can be ameloriated by controlling the amount of buffer space used by a transaction. A high water and low
+water mark are set in terms of bytes used by the transaction. If the buffer space in use exceeds the high water mark,
+the connection is throttled to prevent additional external data from arriving. Internal operations continue to proceed
+at full speed until the buffer space in use drops below the low water mark and external data I/O is re-enabled.
+
+Although this is intended primarily to limit the memory usage of Traffic Server it can also serve as a crude rate
+limiter by setting a buffer limit and then throttling the client side connection either externally or via a transform.
+This will cause the connection to the origin server to be limited to roughly the client side connection speed.
+
+Traffic Server does network I/O in large chunks (32K or so) and therefore the granularity of transaction buffering
+control is limited to a similar precision.
+
+The buffer size calculations include all elements in the transaction, including any buffers associated with :ref:`transform plugins <transform-plugin>`.
+
+Transaction buffering control can be enabled globally by using configuration variables or by :c:func:`TSHttpTxnConfigIntSet` in a plugin.
+
+================= ================================================== ========================================
+Value Variable `TSHttpTxnConfigIntSet` key
+================= ================================================== ========================================
+Enable buffering :ts:cv:`proxy.config.http.flow_control.enabled` `TS_CONFIG_HTTP_FLOW_CONTROL_ENABLED`
+Set high water :ts:cv:`proxy.config.http.flow_control.high_water` `TS_CONFIG_HTTP_FLOW_CONTROL_HIGH_WATER`
+Set low water :ts:cv:`proxy.config.http.flow_control.low_water` `TS_CONFIG_HTTP_FLOW_CONTROL_LOW_WATER`
+================= ================================================== ========================================
+
+Be careful to always have the low water mark equal or less than the high water mark. If you set only one, the other will
+be set to the same value.
+
+If using c:func:`TSHttpTxnConfigIntSet`, it must be called no later than `TS_HTTP_READ_RESPONSE_HDR_HOOK`.
+
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bb50292e/doc/glossary.en.rst
----------------------------------------------------------------------
diff --git a/doc/glossary.en.rst b/doc/glossary.en.rst
index e477540..0970090 100644
--- a/doc/glossary.en.rst
+++ b/doc/glossary.en.rst
@@ -53,3 +53,8 @@ Glossary
storage unit
The physical storage described by a single line in :file:`storage.config`.
+
+ revalidation
+ Verifying that a currently cached object is still valid. This is usually done using an `If-Modified-Since
+ <http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.25>`_ request which allows the origin server to
+ validate the content without resending the content.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bb50292e/doc/reference/api/TSHttpOverridableConfig.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/api/TSHttpOverridableConfig.en.rst b/doc/reference/api/TSHttpOverridableConfig.en.rst
new file mode 100644
index 0000000..09c1774
--- /dev/null
+++ b/doc/reference/api/TSHttpOverridableConfig.en.rst
@@ -0,0 +1,70 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+.. default-domain:: c
+
+.. _ts-overridable-config:
+
+=======================
+TSHttpOverridableConfig
+=======================
+
+Synopsis
+========
+`#include <ts/ts.h>`
+
+.. type:: TSOverridableConfigKey
+
+.. function:: TSReturnCode TSHttpTxnConfigIntSet(TSHttpTxn txnp, TSOverridableConfigKey key, TSMgmtInt value)
+.. function:: TSReturnCode TSHttpTxnConfigIntGet(TSHttpTxn txnp, TSOverridableConfigKey key, TSMgmtInt* value)
+.. function:: TSReturnCode TSHttpTxnConfigFloatSet(TSHttpTxn txnp, TSOverridableConfigKey key, TSMgmtFloat value)
+.. function:: TSReturnCode TSHttpTxnConfigFloatGet(TSHttpTxn txnp, TSOverridableConfigKey key, TSMgmtFloat* value)
+.. function:: TSReturnCode TSHttpTxnConfigStringSet(TSHttpTxn txnp, TSOverridableConfigKey key, const char* value, int length)
+.. function:: TSReturnCode TSHttpTxnConfigStringGet(TSHttpTxn txnp, TSOverridableConfigKey key, const char** value, int* length)
+.. function:: TSReturnCode TSHttpTxnConfigFind(const char* name, int length, TSOverridableConfigKey* key, TSRecordDataType* type)
+
+Description
+===========
+
+Some of the values that are set in :file:`records.config` can be changed for a specific transaction. It is important to
+note that these functions change the configuration values stored for the transation, which is not quite the same as
+changing the actual operating values of the transaction. The critical effect is the value must be changed before it is
+used by the transaction - after that, changes will not have any effect.
+
+All of the ``...Get`` functions store the internal value in the storage indicated by the :arg:`value` argument. For strings :arg:`length*` will receive the length of the string.
+
+The values are identified by the enumeration :type:`TSOverridableConfigKey`. String values can be used indirectly by
+first passing them to :func:`TSHttpTxnConfigFind` which, if the string matches an overridable value, return the key and data
+type.
+
+Examples
+========
+
+Enable :ref:`transaction buffer control <transaction-buffering-control>` with a high water mark of 262144 and a low water mark of 65536. ::
+
+ int callback(TSCont contp, TSEvent event, void* data)
+ {
+ TSHttpTxn txnp = static_cast<TSHttpTxn>(data);
+ TSHttpTxnConfigIntSet(txnp, TS_CONFIG_HTTP_FLOW_CONTROL_ENABLED, 1);
+ TSHttpTxnConfigIntSet(txnp, TS_CONFIG_HTTP_FLOW_CONTROL_HIGH_WATER_MARK, 262144);
+ TSHttpTxnConfigIntSet(txnp, TS_CONFIG_HTTP_FLOW_CONTROL_LOWER_WATER_MARK, 65536);
+ return 0;
+ }
+
+See also
+========
+:manpage:`TSAPI(3ts)`
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bb50292e/doc/reference/api/TSLifecycleHookAdd.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/api/TSLifecycleHookAdd.en.rst b/doc/reference/api/TSLifecycleHookAdd.en.rst
index 31dc461..b546b77 100644
--- a/doc/reference/api/TSLifecycleHookAdd.en.rst
+++ b/doc/reference/api/TSLifecycleHookAdd.en.rst
@@ -36,11 +36,6 @@ Description
based on the Traffic Server process, not on any specific transaction or session. These will typically be called only
once during the execution of the Traffic Server process and therefore should be added in :func:`TSPluginInit` (which could itself be considered a lifecyle hook). Unlike other hooks, lifecycle hooks may not have a well defined ordering and use of them should not assume that one of the hooks is always called before another unless specifically mentioned.
-These were introduced to solve process initialization ordering issues (TS-1487). Different API calls required different
-modules of Traffic Server to be initialized and all of them had to be called from :func:`TSPluginInit`. The solution was
-to move :func:`TSPluginInit` as early as possible in the process initialization and provide hooks for API calls that
-needed to be invoked later.
-
`TS_LIFECYCLE_PORTS_INITIALIZED_HOOK`
Called after the :ts:cv:`proxy server port <proxy.config.http.server_ports>` data structures have been initialized
but before connections are accepted on those ports. The sockets corresponding to the ports may or may not be open
@@ -70,12 +65,12 @@ Ordering
Examples
========
-The following example demonstrates how to correctly use :func:`TSNetAcceptNamedProtocol`, which does not work if called
-from :func:`TSPluginInit` directly. ::
+The following example demonstrates how to correctly use :func:`TSNetAcceptNamedProtocol`, which requires the proxy ports
+to be initialized and therefore does not work if called from :func:`TSPluginInit` directly. ::
#include <ts/ts.h>
- #define SSL_PROTOCOL_NAME "blah blah"
+ #define SSL_PROTOCOL_NAME "whatever"
static int
ssl_proto_handler(TSCont contp, TSEvent event, void* data)
@@ -86,8 +81,11 @@ from :func:`TSPluginInit` directly. ::
static int
local_ssl_init(TSCont contp, TSEvent event, void *edata)
{
- if (TS_EVENT_LIFECYCLE_PORTS_INITIALIZED) { // just to be safe.
- TSNetAcceptNamedProtocol(TSContCreate(ssl_proto_handler, NULL), SSL_PROTOCOL_NAME);
+ if (TS_EVENT_LIFECYCLE_PORTS_INITIALIZED == event) { // just to be safe.
+ TSNetAcceptNamedProtocol(
+ TSContCreate(ssl_proto_handler, TSMutexCreate()),
+ SSL_PROTOCOL_NAME
+ );
}
return 0;
}
@@ -98,6 +96,14 @@ from :func:`TSPluginInit` directly. ::
TSLifecycleHookAdd(TS_LIFECYCLE_PORTS_INITIALIZED_HOOK, TSContCreate(local_ssl_init, NULL));
}
+History
+=======
+
+Lifecycle hooks were introduced to solve process initialization ordering issues (TS-1487). Different API calls required
+different modules of Traffic Server to be initialized for the call to work, but others did not work that late in initialization, which was problematic because all of them could effectively only be called from :func:`TSPluginInit` . The
+solution was to move :func:`TSPluginInit` as early as possible in the process initialization and provide hooks for API
+calls that needed to be invoked later which served essentially as additional pluging initialization points.
+
See also
========
:manpage:`TSAPI(3ts)`, :manpage:`TSContCreate(3ts)`
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bb50292e/doc/reference/api/TSTypes.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/api/TSTypes.en.rst b/doc/reference/api/TSTypes.en.rst
index e24d603..4c4641e 100644
--- a/doc/reference/api/TSTypes.en.rst
+++ b/doc/reference/api/TSTypes.en.rst
@@ -28,7 +28,8 @@ Synopsis
Description
===========
-The Apache Traffic Server API provides large number of types.
+The Apache Traffic Server API provides large number of types. Many of them are specific to a particular API function or
+function group, but others are used more widely. Those are described on this page.
.. type:: TSCont
@@ -61,3 +62,16 @@ The Apache Traffic Server API provides large number of types.
An indicator of the results of an API call. A value of :const:`TS_SUCCESS` means the call was successful. Any other value
indicates a failure and is specific to the API call.
+.. type:: TSRecordDataType
+
+ An enumeration that specifies the type of a value in an internal data structure that is accessible via the API.
+
+.. type:: TSMgmtInt
+
+ The type used internally for an integer. This corresponds to the value :const:`TS_RECORDDATATYPE_INT` for
+ :type:`TSRecordDataType`.
+
+.. type:: TSMgmtFloat
+
+ The type used internally for a floating point value. This corresponds to the value :const:`TS_RECORDDATATYPE_FLOAT` for
+ :type:`TSRecordDataType`.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bb50292e/doc/reference/api/index.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/api/index.en.rst b/doc/reference/api/index.en.rst
index b1fa32f..3509312 100644
--- a/doc/reference/api/index.en.rst
+++ b/doc/reference/api/index.en.rst
@@ -34,5 +34,6 @@ API Reference
TSTrafficServerVersionGet.en
TSUrlCreate.en
TSLifecycleHookAdd.en
+ TSHttpOverridableConfig.en
TSmalloc.en
TSTypes.en
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bb50292e/doc/reference/configuration/records.config.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/configuration/records.config.en.rst b/doc/reference/configuration/records.config.en.rst
index 4d81143..74867dd 100644
--- a/doc/reference/configuration/records.config.en.rst
+++ b/doc/reference/configuration/records.config.en.rst
@@ -703,14 +703,16 @@ Origin Server Connect Attempts
.. ts:cv:: CONFIG proxy.config.http.origin_min_keep_alive_connections INT 0
:reloadable:
- As connection to an origin server are opened, keep at least 'n' number of connections open to that origin, even if the connection
- isn't used for a long time period. Useful when the origin supports keep-alive, removing the time needed to set up a new connection from
+ As connection to an origin server are opened, keep at least 'n' number of connections open to that origin, even if
+ the connection isn't used for a long time period. Useful when the origin supports keep-alive, removing the time
+ needed to set up a new connection from
the next request at the expense of added (inactive) connections. To enable, set to one (``1``).
.. ts:cv:: CONFIG proxy.config.http.connect_attempts_rr_retries INT 2
:reloadable:
- The maximum number of failed connection attempts allowed before a round-robin entry is marked as 'down' if a server has round-robin DNS entries.
+ The maximum number of failed connection attempts allowed before a round-robin entry is marked as 'down' if a server
+ has round-robin DNS entries.
.. ts:cv:: CONFIG proxy.config.http.connect_attempts_timeout INT 30
:reloadable:
@@ -720,7 +722,8 @@ Origin Server Connect Attempts
.. ts:cv:: CONFIG proxy.config.http.post_connect_attempts_timeout INT 1800
:reloadable:
- The timeout value (in seconds) for an origin server connection when the client request is a ``POST`` or ``PUT`` request.
+ The timeout value (in seconds) for an origin server connection when the client request is a ``POST`` or ``PUT``
+ request.
.. ts:cv:: CONFIG proxy.config.http.down_server.cache_time INT 900
:reloadable:
@@ -730,17 +733,33 @@ Origin Server Connect Attempts
.. ts:cv:: CONFIG proxy.config.http.down_server.abort_threshold INT 10
:reloadable:
- The number of seconds before Traffic Server marks an origin server as unavailable after a client abandons a request because the origin
- server was too slow in sending the response header.
+ The number of seconds before Traffic Server marks an origin server as unavailable after a client abandons a request
+ because the origin server was too slow in sending the response header.
Congestion Control
==================
.. ts:cv:: CONFIG proxy.config.http.congestion_control.enabled INT 0
- Enables (``1``) or disables (``0``) the Congestion Control option, which configures Traffic Server to stop forwarding HTTP requests to
- origin servers when they become congested. Traffic Server sends the client a message to retry the congested origin server later. Refer
- to `Using Congestion Control <../http-proxy-caching#UsingCongestionControl>`_.
+ Enables (``1``) or disables (``0``) the Congestion Control option, which configures Traffic Server to stop forwarding
+ HTTP requests to origin servers when they become congested. Traffic Server sends the client a message to retry the
+ congested origin server later. Refer to `Using Congestion Control <../http-proxy-caching#UsingCongestionControl>`_.
+
+.. ts:cv:: CONFIG proxy.config.http.flow_control.enabled INT 0
+
+ Transaction buffering / flow control is enabled if this is set to a non-zero value. Otherwise no flow control is done.
+
+.. ts:cv:: CONFIG proxy.config.http.flow_control.high_water INT 65536
+ :metric: bytes
+
+ The high water mark for transaction buffer control. External source I/O is halted when the total buffer space in use
+ by the transaction exceeds this value.
+
+.. ts:cv:: CONFIG proxy.config.http.flow_control.low_water INT 65536
+ :metric: bytes
+
+ The low water mark for transaction buffer control. External source I/O is resumed when the total buffer space in use
+ by the transaction is no more than this value.
Negative Response Caching
=========================
@@ -748,8 +767,9 @@ Negative Response Caching
.. ts:cv:: CONFIG proxy.config.http.negative_caching_enabled INT 0
:reloadable:
- When enabled (``1``), Traffic Server caches negative responses (such as ``404 Not Found``) when a requested page does not exist. The next
- time a client requests the same page, Traffic Server serves the negative response directly from cache.
+ When enabled (``1``), Traffic Server caches negative responses (such as ``404 Not Found``) when a requested page does
+ not exist. The next time a client requests the same page, Traffic Server serves the negative response directly from
+ cache.
.. note::
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bb50292e/doc/sdk/http-transformation-plugin.en.rst
----------------------------------------------------------------------
diff --git a/doc/sdk/http-transformation-plugin.en.rst b/doc/sdk/http-transformation-plugin.en.rst
index bc01e0e..b7acfe1 100644
--- a/doc/sdk/http-transformation-plugin.en.rst
+++ b/doc/sdk/http-transformation-plugin.en.rst
@@ -1,3 +1,5 @@
+.. _transform-plugin:
+
HTTP Transformation Plugins
***************************
@@ -8,9 +10,9 @@ HTTP Transformation Plugins
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -84,7 +86,7 @@ relationship between the transformation ``VConnection`` and its
:alt: A Transformation and its VIOs
A Transformation and its VIOs
-
+
Because the Traffic Server API places transformations directly in the
response or request data stream, the transformation ``VConnection`` is
responsible only for reading the data from the input buffer,
[11/21] git commit: finishing up the cleanup of the admin guide
Posted by zw...@apache.org.
finishing up the cleanup of the admin guide
pretty much done with cleanup in the admin guide: We're missing a couple
of links here and there, and the warnings we get from the .. XXX: stuff
is on purpose, because it's broken, and needs retouching. Please either
leave it intact, or fix the documentation.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/a4151235
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/a4151235
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/a4151235
Branch: refs/heads/5.0.x
Commit: a41512358e9f524058d4b68a0658b5c11cf804f6
Parents: 74e88de
Author: Igor Galić <i....@brainsware.org>
Authored: Sun Sep 1 21:32:44 2013 +0200
Committer: Igor Galić <i....@brainsware.org>
Committed: Sun Sep 1 21:32:44 2013 +0200
----------------------------------------------------------------------
doc/admin/event-logging-formats.en.rst | 10 +-
doc/admin/faqs.en.rst | 105 ++++++-------
doc/admin/traffic-server-error-messages.en.rst | 155 +++++++++----------
doc/admin/working-log-files.en.rst | 49 +++---
doc/admin/working-log-files/log-formats.en.rst | 4 +-
.../configuration/logs_xml.config.en.rst | 2 +
6 files changed, 148 insertions(+), 177 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a4151235/doc/admin/event-logging-formats.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/event-logging-formats.en.rst b/doc/admin/event-logging-formats.en.rst
index 8c48bd8..c4d1727 100644
--- a/doc/admin/event-logging-formats.en.rst
+++ b/doc/admin/event-logging-formats.en.rst
@@ -1,3 +1,5 @@
+.. _event-logging-formats:
+
Event Logging Formats
*********************
@@ -123,7 +125,7 @@ The following list describes Traffic Server custom logging fields.
In reverse proxy mode, Traffic Server logs the rewritten/mapped URL
(according to the rules in the
- :ref:`remap.config` file),
+ :file:`remap.config` file),
_not_ the pristine/unmapped URL.
``cquc``
@@ -321,9 +323,9 @@ Squid Logging Formats
The following is a list of the Squid logging fields and the
corresponding logging field symbols.
-===== =============
+================== =============
Squid Field Symbols
-===== =============
+================== =============
``time`` ``cqts``
``elapsed`` ``ttms``
``client`` ``chi``
@@ -334,7 +336,7 @@ Squid Field Symbols
``ident`` ``caun``
``hierarchy/from`` ``phr/pqsn``
``content`` ``psct``
-===== =============
+================== =============
Netscape Common Logging Formats
-------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a4151235/doc/admin/faqs.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/faqs.en.rst b/doc/admin/faqs.en.rst
index dfc566d..d8b0894 100644
--- a/doc/admin/faqs.en.rst
+++ b/doc/admin/faqs.en.rst
@@ -1,3 +1,5 @@
+.. _admin-faqs:
+
FAQ and Troubleshooting Tips
****************************
@@ -27,9 +29,9 @@ FAQs
How do you create a raw disk for the cache if all your disks have mounted file systems?
---------------------------------------------------------------------------------------
-Create a large file on filesystem (with ``dd``) and mount it as loopback device.
-This is accomplished with ``loosetup(8)`` on Linux, ``lofiadm(1m)`` on Solaris
-and Illumos, and ``mdconfig(8)`` on FreeBSD.
+Create a large file on filesystem (with :manpage`dd(1)`) and mount it as loopback device.
+This is accomplished with :manpage:`losetup(8)` on Linux, :manpage:`lofiadm(1m)` on Solaris
+and Illumos, and :manpage:`mdconfig(8)` on FreeBSD.
How do disk I/O errors affect the cache and what does Traffic Server do when a cache disk fails?
------------------------------------------------------------------------------------------------
@@ -61,27 +63,19 @@ Traffic Server does not execute the applets, scripts, or programs,
however - these objects run only when the client system (ie, the one
that sent the request) loads them.
-How do you apply changes to the ``logs_xml.config`` file to all nodes in a cluster?
------------------------------------------------------------------------------------
-
-Link to documentation
-
In Squid- and Netscape-format log files, what do the cache result codes mean?
-----------------------------------------------------------------------------
-This is described in detail in the `Squid log format
-documentation <../working-log-files/squid-format>`_
+This is described in detail in the :ref:`log-formats-squid-format`
What is recorded by the ``cqtx`` field in a custom log file?
------------------------------------------------------------
- In **forward proxy mode**, the cqtx field records the complete client
- request in the log file (for example, GET http://www.company.com
- HTTP/1.0 ).
+ request in the log file (for example, ``GET http://www.company.com HTTP/1.0``).
- In **reverse proxy mode**, the cqtx field records the hostname or IP
address of the origin server because Traffic Server first remaps the
- request as per map rules in the
- `remap.config <../configuration-files/remap.config>`_ file.
+ request as per map rules in the :file:`remap.config` file.
Does Traffic Server refresh entries in its host database after a certain period of time if they have not been used?
-------------------------------------------------------------------------------------------------------------------
@@ -94,9 +88,7 @@ to compare the ``ttl`` value set by the name server with the ``ttl``
value set by Traffic Server, and then use either the lower or the higher
value.
-see
-`proxy.config.hostdb.ttl_mode <../configuration-files/records.config#proxy.config.hostdb.ttl_mode>`_
-for more info
+see :ts:cv:`proxy.config.hostdb.ttl_mode` for more info
Can you improve the look of your custom response pages by using images, animated .gifs, and Java applets?
---------------------------------------------------------------------------------------------------------
@@ -113,27 +105,24 @@ Can Traffic Server run in forward proxy and reverse proxy modes at the same time
---------------------------------------------------------------------------------
Yes. When you enable reverse proxy mode, Traffic Server remaps incoming
-requests according to the map rules in the
-```remap.config`` <../configuration-files/remap.config>`_ file. All
+requests according to the map rules in the :file:`remap.config` file. All
other requests that do not match a map rule are simply served in forward
proxy mode.
If you want to run in reverse proxy only mode (wherein Traffic Server
does *not* serve requests that fail to match a map rule), then you must
-set the configuration variable
-`proxy.config.url_remap.remap_required <../configuration-files/records.config#proxy.config.url_remap.remap_required>`_
-to ``1`` in the
-`:file:`records.config` <../configuration-files/records.config>`_ file.
+set the configuration variable :ts:cv:`proxy.config.url_remap.remap_required`
+to ``1`` in the :file:`records.config` file.
How do I enable forward proxy mode
----------------------------------
-Please refer to the `Forward Proxy <../forward-proxy>`_ documentation
+Please refer to the :ref:`forward-proxy` documentation
How do I interpret the Via: header code?
----------------------------------------
-Take a look at our `Via decoder Ring </tools/via>`_
+Take a look at our `Via decoder Ring <http://trafficserver.apache.org/tools/via>`_
Support for HTTP Expect: Header
-------------------------------
@@ -177,26 +166,29 @@ You are unable to execute Traffic Line commands
Traffic Line commands do not execute under the following conditions:
-- **When the :program:`traffic_manager` process is not running** Check to see
- if the ``**traffic_manager**`` process is running by entering the
- following command: ``ps aux | grep traffic_manager``
+- **When the traffic_manager process is not running** Check to see
+ if the :program:`traffic_manager` process is running by entering the
+ following command: ``pgrep -l traffic_manager``
+
+ If the :program:`traffic_manager` process is not running, then enter the
+ following command from the Traffic Server ``bin`` directory to start it:
+ ``./traffic_manager``
+
+ .. this is wrong
+
+ You should always start and stop Traffic Server with the
+ :program:`trafficserver start`` and :program:`trafficserver stop` commands to ensure
+ that all the processes start and stop correctly. For more information,
+ refer to :ref:`getting-started`.
-If the :program:`traffic_manager` process is not running, then enter the
-following command from the Traffic Server ``bin`` directory to start it:
-``./traffic_manager``
+- **When you are not executing the command from $TSHome/bin** If the Traffic Server
+ ``bin`` directory is not in your path, then prepend the Traffic Line
+ commands with ``./`` (for example, ``./traffic_line -h``).
-.. this is wrong
+- **When multiple Traffic Server installations are present and you are not
+ executing the Traffic Line command from the active Traffic Server path
+ specified in ``/etc/trafficserver``**
-You should always start and stop Traffic Server with the
-``start_traffic_server``\ and ``stop_traffic_server`` commands to ensure
-that all the processes start and stop correctly. For more information,
-refer to `Getting Started <getstart.htm>`_. \* \* **When you are not
-executing the command from ``$TSHome/bin``** If the Traffic Server
-``bin`` directory is not in your path, then prepend the Traffic Line
-commands with ``./`` (for example, ``./traffic_line -h``). \* \* *\*
-When multiple Traffic Server installations are present and you are not
-executing the Traffic Line command from the active Traffic Server path
-specified in ``/etc/trafficserver``*\ \*
You observe inconsistent behavior when one node obtains an object from another node in the cluster
--------------------------------------------------------------------------------------------------
@@ -212,9 +204,8 @@ the latest version of xntpd, go to ``http://www.eecis.udel.edu/~ntp/``
Web browsers display an error document with a 'data missing' message
--------------------------------------------------------------------
-A message similar to the following might display in web browsers:
+A message similar to the following might display in web browsers: ::
-::
Data Missing
This document resulted from a POST operation and has expired from the cache. You can repost the form data to recreate the document by pressing the Reload button.
@@ -230,9 +221,8 @@ Traffic Server does not resolve any websites
--------------------------------------------
The browser indicates that it is contacting the host and then times out
-with the following message:
+with the following message: ::
-::
The document contains no data; Try again later, or contact the server's Administrator...
Make sure the system is configured correctly and that Traffic Server can
@@ -240,14 +230,14 @@ read the name resolution file:
- Check if the server can resolve DNS lookups by issuing the nslookup
command (for example, ``nslookup www.myhost.com``).
-- Check if the ``/etc/resolv.conf`` file contains valid IP addresses
+- Check if the :manpage:`resolv.conf(5)` file contains valid IP addresses
for your DNS servers.
-- On some systems, if the ``/etc/resolv.conf`` file is unreadable or
+- On some systems, if the :manpage:`resolv.conf(5)` file is unreadable or
has no name server entry, then the operating system uses
``localhost`` as a name server. Traffic Server, however, does not use
this convention. If you want to use ``localhost`` as a name server,
then you must add a name server entry for ``127.0.0.1`` or
- ``0.0.0.0`` in the ``/etc/resolv.conf`` file.
+ ``0.0.0.0`` in the :manpage:`resolv.conf(5)` file.
- Check that the Traffic Server user account has permission to read the
/etc/resolv.conf file. If it does not, then change the file
permissions to ``rw-r--r--`` (``644``)
@@ -255,25 +245,23 @@ read the name resolution file:
'Maximum document size exceeded' message in the system log file
---------------------------------------------------------------
-The following message appears in the system log file:
+The following message appears in the system log file: ::
-::
WARNING: Maximum document size exceeded
A requested object was larger than the maximum size allowed in the
Traffic Server cache, so Traffic Server provided proxy service for the
oversized object but did not cache it. To set the object size limit for
-the cache, modify the proxy.config.cache.limits.http.max_doc_size
+the cache, modify the :ts:cv:`proxy.config.cache.limits.http.max_doc_size`
variable in the records.config file. If you do not want to limit the
size of objects in the cache, then set the document size
-to\ ``**0**``\ (zero).
+to ``0`` (zero).
'DrainIncomingChannel' message in the system log file
-----------------------------------------------------
-The following messages may appear in the system log file:
+The following messages may appear in the system log file: ::
-::
Feb 20 23:53:40 louis traffic_manager[4414]: ERROR ==> [drainIncomingChannel] Unknown message: 'GET http://www.telechamada.pt/ HTTP/1.0'
Feb 20 23:53:46 louis last message repeated 1 time
Feb 20 23:53:58 louis traffic_manager[4414]: ERROR ==> [drainIncomingChannel] Unknown message: 'GET http://www.ip.pt/ HTTP/1.0'
@@ -290,16 +278,15 @@ client machines have no access to the cluster ports.
'No cop file' message in the system log file
--------------------------------------------
-The following message appears repeatedly in the system log file:
+The following message appears repeatedly in the system log file: ::
-::
traffic_cop[16056]: encountered "var/trafficserver/no_cop" file...exiting
The file ``var/trafficserver/no_cop`` acts as an administrative control
that instructs the :program:`traffic_cop` process to exit immediately without
starting :program:`traffic_manager` or performing any health checks. The
``no_cop`` file prevents Traffic Server from starting automatically when
-it has been stopped with the ``stop_traffic_server`` command. Without
+it has been stopped with the option:`trafficserver stop` command. Without
this static control, Traffic Server would restart automatically upon
system reboot. The ``no_cop`` control keeps Traffic Server off until it
is explicitly restarted with the ::
@@ -367,7 +354,7 @@ Connection throttle events can occur under the following conditions:
If necessary, you can reset the maximum number of connections supported
by Traffic Server by editing the value of the
-``_proxy.config.net.connections_throttle _`` configuration variable in
+:ref:`proxy.config.net.connections_throttle` configuration variable in
the records.config file. Do not increase the connection throttle limit
unless the system has adequate memory to handle the client connections
required. A system with limited RAM might need a throttle limit lower
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a4151235/doc/admin/traffic-server-error-messages.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/traffic-server-error-messages.en.rst b/doc/admin/traffic-server-error-messages.en.rst
index d05758a..276f94d 100644
--- a/doc/admin/traffic-server-error-messages.en.rst
+++ b/doc/admin/traffic-server-error-messages.en.rst
@@ -20,18 +20,8 @@ Error Messages
specific language governing permissions and limitations
under the License.
-This section contains the following sections:
-
-- `Traffic Server Error Messages <#TSErrorMessages>`_: describes the
- warning messages Traffic Server sends to the system log file.
-- `Traffic Server Alarm Messages <#TSAlarmMessages>`_: describes the
- alarm messages that may appear on Traffic Manager Monitor pages.
-- `HTML Messages Sent to Clients <#HTMLMessagesSentClients>`_:
- describes the HTML error messages Traffic Server sends to browser
- clients.
-- `Standard HTTP Response Messages <#StandardHTTPResponseMessages>`_:
- describes the standard HTTP response codes origin servers send to
- browser clients.
+.. toctree::
+ :maxdepth: 2
Traffic Server Error Messages
=============================
@@ -55,39 +45,40 @@ Traffic Server Process Fatal
Traffic Server Warnings
-----------------------
-*``Logfile``* ``error:`` *``error_number``*
+``<Logfile> error: error_number``
Generic logging error.
-``Bad cluster major version range`` *``version1-version2``* ``for node`` *``IP address``* ``connect failed``
+``Bad cluster major version range <version1-version2> for node <IP address> connect failed``
Incompatible software versions causing a problem.
-``Connect by disallowed client`` *``IP address``*\ ``, closing``
+``Connect by disallowed client <IP address>, closing``
The specified client is not allowed to connect to Traffic Server;
the client IP address is not listed in the ``ip_allow.config`` file.
-``Could not rename log`` *``filename``* to *``rolled filename``*
+``Could not rename log <filename> to <rolled filename``
System error when renaming log file during roll.
-``Did`` *``this_amount``* ``of backup; still to do`` *``remaining_amount``*
+``Did <this amount> of backup; still to do <remaining amount>``
Congestion is approaching.
-``Different clustering minor versions`` *``version1, version2``* ``for node`` *``IP address``* ``continuing``
+``Different clustering minor versions <version1, version2> for node <IP address> continuing``
Incompatible software versions are causing a problem.
-``Log format symbol`` *``symbol_name``* ``not found``
+``Log format symbol <symbol name> not found``
Custom log format references a field symbol that does not exist.
- Refer to `Event Logging Formats <logfmts.htm>`_.
+ Refer to :ref:`event-logging-formats`.
``Missing field for field marker``
Error reading a log buffer.
-``Unable to open log file`` *``filename``* ``, errno=`` *``error_number``* Cannot open the log file.
+``Unable to open log file <filename>, errno=<error number>``
+ Cannot open the log file.
-``Error accessing disk`` *``disk_name``*
+``Error accessing disk <disk name>``
Traffic Server might have a cache read problem. You might need to
replace the disk.
-``Too many errors accessing disk`` *``disk_name``* ``: declaring disk bad``
+``Too many errors accessing disk <disk name>: declaring disk bad``
Traffic Server is not using the cache disk because it encountered
too many errors. The disk might be corrupt and might have to be
replaced.
@@ -100,15 +91,15 @@ Traffic Server Warnings
Traffic Server Alarm Messages
=============================
-``[Rollback::Rollback] Config file is read-only:`` *``filename``*
+``[Rollback::Rollback] Config file is read-only: <filename>``
Go to the Traffic Server ``config`` directory and check the
indicated file permissions; change if necessary.
-``[Rollback::Rollback] Unable to read or write config file`` *``filename``*
+``[Rollback::Rollback] Unable to read or write config file <filename>``
Go to the Traffic Server ``config`` directory and make sure the
indicated file exists. Check permissions and modify if necessary.
-``[Traffic Manager] Configuration File Update Failed:`` *``error_number``*
+``[Traffic Manager] Configuration File Update Failed: <error number>``
Go to the Traffic Server ``config`` directory and check the
indicated file permissions; change if necessary.
@@ -128,15 +119,15 @@ Traffic Server Alarm Messages
To prevent this error, consider rolling log files more frequently
and enabling the autodelete feature.
-``Created zero length place holder for config file`` *``filename``*
+``Created zero length place holder for config file <filename>``
Go to the Traffic Server ``config`` directory and check the
indicated file. If it is indeed zero in length, then use a backup
copy of the configuration file.
-``Traffic Server could not open logfile`` *``filename``*
+``Traffic Server could not open logfile <filename>``
Check permissions for the indicated file and the logging directory.
-``Traffic Server failed to parse line`` *``line_number``* ``of the logging config file`` *``filename``*
+``Traffic Server failed to parse line <line number> of the logging config file <filename>``
Check your custom log configuration file; there could be syntax
errors. Refer to :ref:`custom-logging-fields` for correct custom log format fields.
@@ -152,16 +143,15 @@ Traffic Server returns detailed error messages to browser clients when
there are problems with the HTTP transactions requested by the browser.
These Traffic Server response messages correspond to standard HTTP
response codes, but provide more information. A list of the more
-frequently-encountered HTTP response codes is provided in `Standard HTTP
-Response Messages <#StandardHTTPResponseMessages>`_. You can customize
-the Traffic Server response messages, if desired.
+frequently-encountered HTTP response codes is provided in :ref:`Standard HTTP
+Response Messages`. You can customize the Traffic Server response messages, if desired.
The following table lists the hard-coded Traffic Server HTTP messages,
with corresponding HTTP response codes and customizable files.
``Access Denied``
``403``
- You are not allowed to access the document at location *``URL``* .
+ You are not allowed to access the document at location ``URL``.
``access#denied``
``Cache Read Error``
@@ -176,24 +166,25 @@ with corresponding HTTP response codes and customizable files.
``Content Length Required``
``400``
- Could not process this request because ``Content-Length`` was not
- specified.
+ Could not process this request because ``Content-Length`` was not specified.
``request#no_content_length``
``Cycle Detected``
``400``
- Your request is prohibited because it would cause an HTTP proxy
- cycle.
+ Your request is prohibited because it would cause an HTTP proxy cycle.
``request#cycle_detected``
-``Forbidden 403`` *``port_number``* is not an allowed port for SSL connections (you have made a request for a secure SSL connection to a forbidden port number). ``access#ssl_forbidden``
+``Forbidden``
+ ``403``
+ ``<port number>`` is not an allowed port for SSL connections (you have made a request for a secure SSL connection to a forbidden port number).
+ ``access#ssl_forbidden``
``Host Header Required``
``400``
An attempt was made to transparently proxy your request, but this
attempt failed because your browser did not send an HTTP ``Host``
header. Manually configure your browser to use
- ``http://``\ *``proxy_name``*\ ``:``\ *``proxy_port``* as the HTTP
+ ``http://<proxy name>:<proxy port>`` as the HTTP
proxy. Alternatively, end users can upgrade to a browser that
supports the HTTP ``Host`` header field.
``interception#no_host``
@@ -208,43 +199,38 @@ with corresponding HTTP response codes and customizable files.
``HTTP Version Not Supported``
``505``
- The origin server *``server_name``* is using an unsupported version
+ The origin server ``<server name>`` is using an unsupported version
of the HTTP protocol.
``response#bad_version``
``Invalid HTTP Request``
``400``
- Could not process this *``client_request``* HTTP method request for
- *``URL``*.
+ Could not process this ``<client request>`` HTTP method request for ``URL``.
``request#syntax_error``
``Invalid HTTP Response``
``502``
- The host *``server_name``* did not return the document *``URL``*
- correctly.
+ The host ``<server name>`` did not return the document ``URL`` correctly.
``response#bad_response``
``Malformed Server Response``
``502``
- The host *``server_name``* did not return the document *``URL``*
- correctly.
+ The host ``<server name>`` did not return the document ``URL`` correctly.
``response#bad_response``
``Malformed Server Response Status``
``502``
- The host *``server_name``* did not return the document *``URL``*
- correctly.
+ The host ``<server name>`` did not return the document ``URL`` correctly.
``response#bad_response``
``Maximum Transaction Time exceeded``
``504``
- Too much time has elapsed while transmitting document *``URL``* .
+ Too much time has elapsed while transmitting document ``URL``.
``timeout#activity``
``No Response Header From Server``
``502``
- The host *``server_name``* did not return the document *``URL``*
- correctly.
+ The host ``<server name>`` did not return the document ``URL`` correctly.
``response#bad_response``
``Not Cached``
@@ -255,14 +241,13 @@ with corresponding HTTP response codes and customizable files.
``Not Found on Accelerator``
``404``
- The request for *``URL``* on host *``server_name``* was not found.
+ The request for ``URL`` on host ``<server name>`` was not found.
Check the location and try again.
``urlrouting#no_mapping``
``NULL``
``502``
- The host *``hostname``* did not return the document *``URL``*
- correctly.
+ The host ``<hostname>`` did not return the document ``URL`` correctly.
``response#bad_response``
``Proxy Authentication Required``
@@ -272,36 +257,32 @@ with corresponding HTTP response codes and customizable files.
``Server Hangup``
``502``
- The server *``hostname``* closed the connection before the
- transaction was completed.
+ The server ``<hostname>`` closed the connection before the transaction was completed.
``connect#hangup``
``Temporarily Moved``
``302``
- The document you requested, *``URL``*, has moved to a new location.
- The new location is *``new_URL``*.
+ The document you requested, ``URL``, has moved to a new location. The new location is ``<new URL>``.
``redirect#moved_temporarily``
``Transcoding Not Available``
``406``
- Unable to provide the document *``URL``* in the format requested by
- your browser.
+ Unable to provide the document ``URL`` in the format requested by your browser.
``transcoding#unsupported``
``Tunnel Connection Failed``
``502``
- Could not connect to the server *``hostname``*.
+ Could not connect to the server ``<hostname>``.
``connect#failed_connect``
``Unknown Error``
``502``
- The host *``hostname``* did not return the document *``URL``*
- correctly.
+ The host ``<hostname>`` did not return the document ``URL`` correctly.
``response#bad_response``
``Unknown Host``
``500``
- Unable to locate the server named *``hostname``*; the server does
+ Unable to locate the server named ``<hostname>``; the server does
not have a DNS entry. Perhaps there is a misspelling in the server
name or the server no longer exists; double-check the name and try
again.
@@ -309,72 +290,76 @@ with corresponding HTTP response codes and customizable files.
``Unsupported URL Scheme``
``400``
- Cannot perform your request for the document *``URL``* because the
+ Cannot perform your request for the document ``URL`` because the
protocol scheme is unknown.
``request#scheme_unsupported``
+
+.. standard-http-response-messages:
+
Standard HTTP Response Messages
-------------------------------
The following standard HTTP response messages are provided for your
information.
-**``200``**
+``200``
OK
-**``202``**
+``202``
Accepted
-**``204``**
+``204``
No Content
-**``206``**
+``206``
Partial Content
-**``300``**
+``300``
Multiple Choices
-**``301``**
+``301``
Moved Permanently
-**``302``**
+``302``
Found
-**``303``**
+``303``
See Other
-**``304``**
+``304``
Not Modified
-**``400``**
+``400``
Bad Request
-**``401``**
+``401``
Unauthorized; retry
-**``403``**
+``403``
Forbidden
-**``404``**
+``404``
Not Found
-**``405``**
+``405``
Method Not Allowed
-**``406``**
+``406``
Not acceptable
-**``408``**
+``408``
Request Timeout
-**``500``**
+``500``
Internal server error
-**``501``**
+``501``
Not Implemented
-**``502``**
+``502``
Bad Gateway
-**``504``**
+``504``
Gateway Timeout
+
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a4151235/doc/admin/working-log-files.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/working-log-files.en.rst b/doc/admin/working-log-files.en.rst
index 1da9284..ae03c98 100644
--- a/doc/admin/working-log-files.en.rst
+++ b/doc/admin/working-log-files.en.rst
@@ -267,6 +267,8 @@ Set standard log file format options by following the steps below:
.. XXX:: setting what values?
+.. _using-custom-log-formats:
+
Using the Custom Format
~~~~~~~~~~~~~~~~~~~~~~~
@@ -330,13 +332,9 @@ In order to accomplish this, we
2. :ts:cv:`proxy.config.log.custom_logs_enabled`
3. In the
:file:`logs_xml.config` file
-4. Add
- ```LogFormat`` <../configuration-files/logs_xml.config#LogFormat>`_,
- ```LogFilter`` <../configuration-files/logs_xml.config#LogFilters>`_,
- and
- ```LogObject`` <../configuration-files/logs_xml.config#LogObject>`_
+4. Add :ref:`LogFormat`, :ref:`LogFilters`, and :ref:`LogObject`
specifications to the configuration file.
-5. Save and close the ``log``s_xml.config`` file.
+5. Save and close the :file:`logs_xml.config` file.
6. Run the command :option:`traffic_line -x` to apply your configuration
changes.
@@ -351,8 +349,7 @@ period of time. This can significantly reduce the size of the log files
generated.
To generate a summary log file, create a
-```LogFormat`` <../configuration-files/logs_xml.config#LogFormat>`_
-object in the XML-based logging configuration file
+:ref:`LogFormat` object in the XML-based logging configuration file
(:file:`logs_xml.config`) using
the SQL-like aggregate operators below. You can apply each of these
operators to specific fields, over a specified interval.
@@ -448,8 +445,8 @@ calculate a rough metric that compares the two formats.
For standard log formats, select Binary or ASCII (refer to `Setting
Standard Log File Format Options`). For the custom log
format, specify ASCII or Binary mode in the
-```LogObject`` <../configuration-files/logs_xml.config#LogObject>`_
-(refer to `Using the Custom Format <#UsingCustomFormat>`_). In addition
+:ref:`LogObject`
+(refer to :ref:`Using the Custom Format <using-custom-log-formats>`). In addition
to the ASCII and binary options, you can also write custom log entries
to a UNIX-named pipe (i.e., a buffer in memory). Other processes can
then read the data using standard I/O functions. The advantage of using
@@ -585,11 +582,11 @@ log files when they reach a certain size, follow the steps below:
changes.
You can fine-tune log file rolling settings for a custom log file in the
-```LogObject`` <../configuration-files/logs_xml.config#LogObject>`_
+:ref:`LogObject`
specification in the
:file:`logs_xml.config` file.
The custom log file uses the rolling settings in its
-```LogObject`` <../configuration-files/logs_xml.config#LogObject>`_,
+:ref:`LogObject`,
which override the default settings you specify in Traffic Manager or
the :file:`records.config` file described above.
@@ -617,12 +614,11 @@ HTTP Host Log Splitting
HTTP host log splitting enables you to record HTTP transactions for
different origin servers in separate log files. When HTTP host log
splitting is enabled, Traffic Server creates a separate log file for
-each origin server that's listed in the
-```log_hosts.config`` <#EditingLogHostsConfigFile>`_ file. When both ICP
-and HTTP host log splitting are enabled, Traffic Server generates
+each origin server that's listed in the :file:`log_hosts.config` file.
+When both ICP and HTTP host log splitting are enabled, Traffic Server generates
separate log files for HTTP transactions (based on the origin server)
and places all ICP transactions in their own respective log files. For
-example, if the ``log_hosts.config`` file contains the two origin
+example, if the :file:`log_hosts.config` file contains the two origin
servers ``uni.edu`` and ``company.com`` and Squid format is enabled,
then Traffic Server generates the following log files:
@@ -743,16 +739,16 @@ To configure Traffic Server to collate event log files, you must perform
the following tasks:
- Either `Configure Traffic Server Node to Be a Collation
- Server <#ConfiguringTSCollationServer>`_ or install & configure a
- `Standalone Collator <#UsingStandaloneCollator>`_.
+ Server <Configuring Traffic Server to Be a Collation Server>`_ or install & configure a
+ `Standalone Collator <Using a Standalone Collator>`_
- `Configure Traffic Server Nodes to Be a Collation
- Clients <#ConfiguringTSCollationClient>`_.
+ Clients <Configuring Traffic Server to Be a Collation Server>`_.
- Add an attribute to the
- ```LogObject`` <../configuration-files/logs_xml.config#LogObject>`_
+ :ref:`LogObject`
specification in the
:file:`logs_xml.config` file
if you are using custom log file formats; refer to `Collating Custom
- Event Log Files <#CollatingCustomEventLogFiles>`_.
+ Event Log Files`_.
Configuring Traffic Server to Be a Collation Server
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -826,7 +822,7 @@ been established, then you must restart Traffic Server.
- :ts:cv:`proxy.local.log.collation_mode`: ``2`` to configure this node as log collation client and send
standard formatted log entries to the collation server.
For XML-based formatted log entries, see :file:`logs_xml.config`
- file; refer to `Using the Custom Format <#UsingCustomFormat>`_.
+ file; refer to :ref:`Using the Custom Format <using-custom-log-formats>`.
- :ts:cv:`proxy.config.log.collation_host`
- :ts:cv:`proxy.config.log.collation_port`
- :ts:cv:`proxy.config.log.collation_secret`
@@ -847,12 +843,9 @@ To collate custom event log files
1. On each collation client, edit the `:file:`logs_xml.config`
2. Add the
- ```CollationHosts`` <../configuration-files/logs_xml.config#LogsXMLObjectCollationHosts>`_
- attribute to the
- ```LogObject`` <../configuration-files/logs_xml.config#LogsXMLObjects>`_
- specification:
-
- ::
+ :ref:`CollationHost <logs-xml-logobject-collationhost>` attribute to the
+ :ref:`LogObject`
+ specification: ::
<LogObject>
<Format = "squid"/>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a4151235/doc/admin/working-log-files/log-formats.en.rst
----------------------------------------------------------------------
diff --git a/doc/admin/working-log-files/log-formats.en.rst b/doc/admin/working-log-files/log-formats.en.rst
index d3aad99..4a1a286 100644
--- a/doc/admin/working-log-files/log-formats.en.rst
+++ b/doc/admin/working-log-files/log-formats.en.rst
@@ -20,6 +20,8 @@ Log Formats
specific language governing permissions and limitations
under the License.
+.. _log-formats-squid-format:
+
Squid Format
============
@@ -45,7 +47,7 @@ Squid Format
The cache result code; how the cache responded to the request:
``HIT``, ``MISS``, and so on. Cache result codes are described
:ref:`here <squid-netscape-result-codes>`.
- The proxy response status code (the HTTP response status code from
+ The proxy response status code (the HTTP response status code from
Traffic Server to client).
``5``
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a4151235/doc/reference/configuration/logs_xml.config.en.rst
----------------------------------------------------------------------
diff --git a/doc/reference/configuration/logs_xml.config.en.rst b/doc/reference/configuration/logs_xml.config.en.rst
index f1796b9..1d2a057 100644
--- a/doc/reference/configuration/logs_xml.config.en.rst
+++ b/doc/reference/configuration/logs_xml.config.en.rst
@@ -215,6 +215,8 @@ The following list shows the ``LogObject`` specifications.
A comma-separated list of valid hostnames.This tag indicates that
only entries from the named servers will be included in the file.
+.. _logs-xml-logobject-collationhost:
+
``<CollationHosts = "list_of_valid_hostnames"/>``
Optional
A comma-separated list of collation servers to which all log entries