You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by el...@apache.org on 2018/02/01 21:57:15 UTC
[incubator-trafficcontrol] branch master updated (4e1f2d9 ->
8973974)
This is an automated email from the ASF dual-hosted git repository.
elsloo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git.
from 4e1f2d9 prepared transactions from within a handler create a connections leak to postgres
new 6110f58 initial commit
new 391feb1 show tr_response_headers field for client steering ds
new a027572 added TR Response Headers field for DS to TP
new ac4df80 removed autofocus attribute from trResponseHeaders field
new 8973974 migration .sql for updating client steering deliveryservices with response headers of subordinate deliveryservices. Fixes #986
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
... => 20180130000000_update_client_steering_headers.sql} | 15 ++++++++-------
traffic_ops/app/templates/delivery_service/add.html.ep | 6 +++++-
traffic_ops/app/templates/delivery_service/edit.html.ep | 6 +++++-
.../form/deliveryService/FormDeliveryServiceController.js | 10 ++++++++++
.../form.deliveryService.Steering.tpl.html | 10 ++++++++++
.../traffic_router/core/http/RouterFilter.java | 4 ++--
.../traffic_router/core/router/TrafficRouter.java | 2 +-
7 files changed, 41 insertions(+), 12 deletions(-)
copy traffic_ops/app/db/migrations/{20180110000000_add_deep_caching_type.sql => 20180130000000_update_client_steering_headers.sql} (64%)
--
To stop receiving notification emails like this one, please contact
elsloo@apache.org.
[incubator-trafficcontrol] 01/05: initial commit
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elsloo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git
commit 6110f585386c0d677fddd31a71c7c378781e94b2
Author: Jesse Rivas <je...@comcast.com>
AuthorDate: Fri Jan 19 11:27:56 2018 -0700
initial commit
---
.../cdn/traffic_control/traffic_router/core/http/RouterFilter.java | 4 ++--
.../cdn/traffic_control/traffic_router/core/router/TrafficRouter.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/RouterFilter.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/RouterFilter.java
index efdbad9..6702741 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/RouterFilter.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/http/RouterFilter.java
@@ -123,8 +123,8 @@ public class RouterFilter extends OncePerRequestFilter {
}
private void setMultiResponse(final HTTPRouteResult routeResult, final HttpServletRequest httpServletRequest, final HttpServletResponse response, final HTTPAccessRecord.Builder httpAccessRecordBuilder) throws IOException {
- for (final DeliveryService deliveryService : routeResult.getDeliveryServices()) {
- final Map<String, String> responseHeaders = deliveryService.getResponseHeaders();
+ if (routeResult.getDeliveryService() != null) {
+ final Map<String, String> responseHeaders = routeResult.getDeliveryService().getResponseHeaders();
for (final String key : responseHeaders.keySet()) {
// if two DSs append the same header, the last one wins; no way around it unless we enforce unique response headers between subordinate DSs
diff --git a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouter.java b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouter.java
index b63e075..acaa9d4 100644
--- a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouter.java
+++ b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/router/TrafficRouter.java
@@ -487,6 +487,7 @@ public class TrafficRouter {
return null;
}
+ routeResult.setDeliveryService(entryDeliveryService);
for (final DeliveryService deliveryService : deliveryServices) {
if (deliveryService.isRegionalGeoEnabled()) {
LOGGER.error("Regional Geo Blocking is not supported with multi-route delivery services.. skipping " + entryDeliveryService.getId() + "/" + deliveryService.getId());
@@ -495,7 +496,6 @@ public class TrafficRouter {
if (deliveryService.isAvailable()) {
final List<Cache> caches = selectCaches(request, deliveryService, track);
- routeResult.addDeliveryService(deliveryService);
if (caches != null && !caches.isEmpty()) {
final Cache cache = consistentHasher.selectHashable(caches, deliveryService.getDispersion(), request.getPath());
--
To stop receiving notification emails like this one, please contact
elsloo@apache.org.
[incubator-trafficcontrol] 05/05: migration .sql for updating
client steering deliveryservices with response headers of subordinate
deliveryservices. Fixes #986
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elsloo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git
commit 897397446456a24bb07223de92b4d6e508676342
Author: Jesse Rivas <je...@comcast.com>
AuthorDate: Tue Jan 30 14:46:49 2018 -0700
migration .sql for updating client steering deliveryservices with response headers of subordinate deliveryservices. Fixes #986
---
...180130000000_update_client_steering_headers.sql | 28 ++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/traffic_ops/app/db/migrations/20180130000000_update_client_steering_headers.sql b/traffic_ops/app/db/migrations/20180130000000_update_client_steering_headers.sql
new file mode 100644
index 0000000..ef233c1
--- /dev/null
+++ b/traffic_ops/app/db/migrations/20180130000000_update_client_steering_headers.sql
@@ -0,0 +1,28 @@
+/*
+ Licensed 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.
+*/
+
+-- +goose Up
+-- SQL in section 'Up' is executed when this migration is applied
+UPDATE deliveryservice
+SET tr_response_headers = subquery.tr_response_headers
+FROM (SELECT ds.id, ds.tr_response_headers, st.deliveryservice
+ FROM deliveryservice ds JOIN steering_target st ON ds.id = st.target
+ WHERE ds.tr_response_headers IS NOT NULL)
+AS subquery
+ WHERE subquery.deliveryservice = deliveryservice.id
+ AND type = (SELECT id from type where name = 'CLIENT_STEERING');
+
+
+-- +goose Down
+-- SQL section 'Down' is executed when this migration is rolled back
--
To stop receiving notification emails like this one, please contact
elsloo@apache.org.
[incubator-trafficcontrol] 03/05: added TR Response Headers field
for DS to TP
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elsloo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git
commit a0275724846275cba521cda7057f310d871ec38d
Author: Jesse Rivas <je...@comcast.com>
AuthorDate: Thu Jan 25 15:08:50 2018 -0700
added TR Response Headers field for DS to TP
---
.../form/deliveryService/FormDeliveryServiceController.js | 10 ++++++++++
.../deliveryService/form.deliveryService.Steering.tpl.html | 10 ++++++++++
2 files changed, 20 insertions(+)
diff --git a/traffic_portal/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js b/traffic_portal/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js
index e554e76..40ad3ab 100644
--- a/traffic_portal/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js
+++ b/traffic_portal/app/src/common/modules/form/deliveryService/FormDeliveryServiceController.js
@@ -69,6 +69,16 @@ var FormDeliveryServiceController = function(deliveryService, type, types, $scop
return currentType.name.indexOf(category) != -1;
});
+ $scope.clientSteeringType = _.findWhere(types, {name: "CLIENT_STEERING"});
+ $scope.isClientSteering = function(ds) {
+ if (ds.typeId == $scope.clientSteeringType.id) {
+ return true;
+ } else {
+ ds.trResponseHeaders = "";
+ return false;
+ }
+ };
+
$scope.falseTrue = [
{ value: true, label: 'true' },
{ value: false, label: 'false' }
diff --git a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.Steering.tpl.html b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.Steering.tpl.html
index 3d097f6..9f8d358 100644
--- a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.Steering.tpl.html
+++ b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.Steering.tpl.html
@@ -215,6 +215,16 @@ under the License.
</div>
</div>
+ <div class="form-group" ng-class="{'has-error': hasError(deliveryServiceForm.trResponseHeaders), 'has-feedback': hasError(deliveryServiceForm.trResponseHeaders)}"
+ ng-if="isClientSteering(deliveryService)">
+ <label class="control-label col-md-2 col-sm-2 col-xs-12">Traffic Router Additional Response Headers</label>
+ <div class="col-md-10 col-sm-10 col-xs-12">
+ <input name="trResponseHeaders" type="text" class="form-control" ng-model="deliveryService.trResponseHeaders" ng-maxlength="1024" autofocus>
+ <small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.trResponseHeaders, 'maxlength')">Too Long</small>
+ <span ng-show="hasError(deliveryServiceForm.trResponseHeaders)" class="form-control-feedback"><i class="fa fa-times"></i></span>
+ </div>
+ </div>
+
<div class="form-group" ng-class="{'has-error': hasError(deliveryServiceForm.ccrDnsTtl), 'has-feedback': hasError(deliveryServiceForm.ccrDnsTtl)}">
<label class="control-label col-md-2 col-sm-2 col-xs-12">Delivery Service DNS TTL</label>
<div class="col-md-10 col-sm-10 col-xs-12">
--
To stop receiving notification emails like this one, please contact
elsloo@apache.org.
[incubator-trafficcontrol] 04/05: removed autofocus attribute from
trResponseHeaders field
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elsloo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git
commit ac4df8006ee999ccce3e6d96f1127d777635bdd4
Author: Jesse Rivas <je...@comcast.com>
AuthorDate: Mon Jan 29 10:09:20 2018 -0700
removed autofocus attribute from trResponseHeaders field
---
.../modules/form/deliveryService/form.deliveryService.Steering.tpl.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.Steering.tpl.html b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.Steering.tpl.html
index 9f8d358..be238f6 100644
--- a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.Steering.tpl.html
+++ b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.Steering.tpl.html
@@ -219,7 +219,7 @@ under the License.
ng-if="isClientSteering(deliveryService)">
<label class="control-label col-md-2 col-sm-2 col-xs-12">Traffic Router Additional Response Headers</label>
<div class="col-md-10 col-sm-10 col-xs-12">
- <input name="trResponseHeaders" type="text" class="form-control" ng-model="deliveryService.trResponseHeaders" ng-maxlength="1024" autofocus>
+ <input name="trResponseHeaders" type="text" class="form-control" ng-model="deliveryService.trResponseHeaders" ng-maxlength="1024">
<small class="input-error" ng-show="hasPropertyError(deliveryServiceForm.trResponseHeaders, 'maxlength')">Too Long</small>
<span ng-show="hasError(deliveryServiceForm.trResponseHeaders)" class="form-control-feedback"><i class="fa fa-times"></i></span>
</div>
--
To stop receiving notification emails like this one, please contact
elsloo@apache.org.
[incubator-trafficcontrol] 02/05: show tr_response_headers field
for client steering ds
Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
elsloo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git
commit 391feb11bac34e429bcf386226488007f3c38689
Author: Jesse Rivas <je...@comcast.com>
AuthorDate: Wed Jan 24 15:14:12 2018 -0700
show tr_response_headers field for client steering ds
---
traffic_ops/app/templates/delivery_service/add.html.ep | 6 +++++-
traffic_ops/app/templates/delivery_service/edit.html.ep | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/traffic_ops/app/templates/delivery_service/add.html.ep b/traffic_ops/app/templates/delivery_service/add.html.ep
index c2f0841..ea718ca 100644
--- a/traffic_ops/app/templates/delivery_service/add.html.ep
+++ b/traffic_ops/app/templates/delivery_service/add.html.ep
@@ -253,7 +253,11 @@
$('#origin_shield_row').hide(speed);
$('#active_row').show(speed);
$('#ds_regexp_table').show(speed);
- $('#tr_response_headers').hide(speed);
+ if (type_selected.match(/CLIENT_STEERING$/)) {
+ $('#tr_response_headers').show(speed);
+ } else {
+ $('#tr_response_headers').hide(speed);
+ }
$('#multi_site_origin_row').hide(speed);
$('#multi_site_origin_algorithm_row').hide(speed);
$('#initial_dispersion_row').hide(speed);
diff --git a/traffic_ops/app/templates/delivery_service/edit.html.ep b/traffic_ops/app/templates/delivery_service/edit.html.ep
index 699361a..e3f674d 100644
--- a/traffic_ops/app/templates/delivery_service/edit.html.ep
+++ b/traffic_ops/app/templates/delivery_service/edit.html.ep
@@ -345,7 +345,11 @@ function setup_form(speed) {
$('#origin_shield_row').hide(speed);
$('#active_row').show(speed);
$('#ds_regexp_table').show(speed);
- $('#tr_response_headers').hide(speed);
+ if (type_selected.match(/CLIENT_STEERING$/)) {
+ $('#tr_response_headers').show(speed);
+ } else {
+ $('#tr_response_headers').hide(speed);
+ }
$('#multi_site_origin_row').hide(speed);
$('#multi_site_origin_algorithm_row').hide(speed);
$('#initial_dispersion_row').hide(speed);
--
To stop receiving notification emails like this one, please contact
elsloo@apache.org.