bneradt commented on a change in pull request #7911: URL: https://github.com/apache/trafficserver/pull/7911#discussion_r644050522
########## File path: tests/gold_tests/next_hop/strategies_ch/strategies_ch.test.py ########## @@ -0,0 +1,122 @@ +''' +''' +# 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. + +Test.Summary = ''' +Test next hop selection using strategies.yaml with consistent hashing. +''' + +dns = Test.MakeDNServer("dns") + +# Define and populate next hop MicroServer instances. +# +num_nh = 8 +server_nh = [] +response_header = { + "headers": + "HTTP/1.1 200 OK\r\n" + "Connection: close\r\n" + "Cache-control: max-age=85000\r\n" + "\r\n", + "timestamp": "1469733493.993", + "body": "xxx\n" +} +for i in range(num_nh): + server = Test.MakeOriginServer(f"server{i}") + for j in range(32): + request_header = { + "headers": + f"GET /obj{j} HTTP/1.1\r\n" + "Host: does.not.matter\r\n" # But cannot be omitted. + "\r\n", + "timestamp": "1469733493.993", + "body": "" + } + server.addResponse("sessionlog.json", request_header, response_header) + server_nh.append(server) + +#ts = Test.MakeATSProcess("ts", command="traffic_server 2> trace.log", block_for_debug=True) +ts = Test.MakeATSProcess("ts", command="traffic_server 2> trace.log") + +ts.Disk.records_config.update({ + 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.tags': 'http|dns|parent|next_hop|host_statuses|hostdb', + 'proxy.config.dns.nameservers': f"127.0.0.1:{dns.Variables.Port}", # Only nameservers if resolv_conf NULL. + 'proxy.config.dns.resolv_conf': "NULL", # This defaults to /etc/resvolv.conf (OS namesevers) if not NULL. + 'proxy.config.http.cache.http': 0, + 'proxy.config.http.uncacheable_requests_bypass_parent': 0, + 'proxy.config.http.no_dns_just_forward_to_parent': 1, + 'proxy.config.http.parent_proxy.mark_down_hostdb': 0, + 'proxy.config.http.parent_proxy.self_detect': 0, +}) + +ts.Disk.File(ts.Variables.CONFIGDIR + "/strategies.yaml", id="strategies", typename="ats:config") +s = ts.Disk.strategies +s.AddLine("groups:") +s.AddLine(" - &g1") +for i in range(num_nh): + dns.addRecords(records={f"next_hop{i}": ["127.0.0.1"]}) + s.AddLine(f" - host: next_hop{i}") + s.AddLine(f" protocol:") + s.AddLine(f" - scheme: http") + s.AddLine(f" port: {server_nh[i].Variables.Port}") + #s.AddLine(f" health_check_url: http://next_hop{i}:{server_nh[i].Variables.Port}";) + s.AddLine(f" weight: 1.0") +s.AddLine("") +s.AddLine("strategies:") +s.AddLine(" - strategy: the-strategy") +s.AddLine(" policy: consistent_hash") +s.AddLine(" hash_key: path") +s.AddLine(" go_direct: false") +s.AddLine(" parent_is_proxy: true") +s.AddLine(" ignore_self_detect: true") +s.AddLine(" groups:") +s.AddLine(" - *g1") +s.AddLine(" scheme: http") +#s.AddLine(" fallover:") +#s.AddLine(" max_simple_retries: 2") +#s.AddLine(" ring_mode: exhaust_ring") +#s.AddLine(" response_codes:") +#s.AddLine(" - 404") +#s.AddLine(" health_check:") +#s.AddLine(" - passive") + +ts.Disk.remap_config.AddLine( + "map http://dummy.com http://not_used @strategy=the-strategy" +) + +tr = Test.AddTestRun() +tr.Processes.Default.StartBefore(dns) +for i in range(num_nh): + tr.Processes.Default.StartBefore(server_nh[i]) +tr.Processes.Default.StartBefore(Test.Processes.ts) +tr.Processes.Default.Command = 'echo start TS, DNS server and next hop HTTP servers' +tr.Processes.Default.ReturnCode = 0 + +for i in range(32): Review comment: Maybe name a variable for 32 called `num_objects`. ########## File path: tests/gold_tests/next_hop/strategies_ch/strategies_ch.test.py ########## @@ -0,0 +1,122 @@ +''' +''' +# 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. + +Test.Summary = ''' +Test next hop selection using strategies.yaml with consistent hashing. +''' + +dns = Test.MakeDNServer("dns") + +# Define and populate next hop MicroServer instances. +# +num_nh = 8 +server_nh = [] +response_header = { + "headers": + "HTTP/1.1 200 OK\r\n" + "Connection: close\r\n" + "Cache-control: max-age=85000\r\n" + "\r\n", + "timestamp": "1469733493.993", + "body": "xxx\n" +} +for i in range(num_nh): + server = Test.MakeOriginServer(f"server{i}") + for j in range(32): + request_header = { + "headers": + f"GET /obj{j} HTTP/1.1\r\n" + "Host: does.not.matter\r\n" # But cannot be omitted. + "\r\n", + "timestamp": "1469733493.993", + "body": "" + } + server.addResponse("sessionlog.json", request_header, response_header) + server_nh.append(server) + +#ts = Test.MakeATSProcess("ts", command="traffic_server 2> trace.log", block_for_debug=True) +ts = Test.MakeATSProcess("ts", command="traffic_server 2> trace.log") + +ts.Disk.records_config.update({ + 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.tags': 'http|dns|parent|next_hop|host_statuses|hostdb', + 'proxy.config.dns.nameservers': f"127.0.0.1:{dns.Variables.Port}", # Only nameservers if resolv_conf NULL. + 'proxy.config.dns.resolv_conf': "NULL", # This defaults to /etc/resvolv.conf (OS namesevers) if not NULL. + 'proxy.config.http.cache.http': 0, + 'proxy.config.http.uncacheable_requests_bypass_parent': 0, + 'proxy.config.http.no_dns_just_forward_to_parent': 1, + 'proxy.config.http.parent_proxy.mark_down_hostdb': 0, + 'proxy.config.http.parent_proxy.self_detect': 0, +}) + +ts.Disk.File(ts.Variables.CONFIGDIR + "/strategies.yaml", id="strategies", typename="ats:config") +s = ts.Disk.strategies +s.AddLine("groups:") +s.AddLine(" - &g1") +for i in range(num_nh): + dns.addRecords(records={f"next_hop{i}": ["127.0.0.1"]}) + s.AddLine(f" - host: next_hop{i}") + s.AddLine(f" protocol:") + s.AddLine(f" - scheme: http") + s.AddLine(f" port: {server_nh[i].Variables.Port}") + #s.AddLine(f" health_check_url: http://next_hop{i}:{server_nh[i].Variables.Port}";) + s.AddLine(f" weight: 1.0") +s.AddLine("") +s.AddLine("strategies:") +s.AddLine(" - strategy: the-strategy") +s.AddLine(" policy: consistent_hash") Review comment: Can `AddLines` be used more naturally for this? ########## File path: tests/gold_tests/next_hop/strategies_ch/strategies_ch.test.py ########## @@ -0,0 +1,122 @@ +''' +''' +# 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. + +Test.Summary = ''' +Test next hop selection using strategies.yaml with consistent hashing. +''' + +dns = Test.MakeDNServer("dns") + +# Define and populate next hop MicroServer instances. +# +num_nh = 8 +server_nh = [] +response_header = { + "headers": + "HTTP/1.1 200 OK\r\n" + "Connection: close\r\n" + "Cache-control: max-age=85000\r\n" + "\r\n", + "timestamp": "1469733493.993", + "body": "xxx\n" +} +for i in range(num_nh): + server = Test.MakeOriginServer(f"server{i}") + for j in range(32): + request_header = { + "headers": + f"GET /obj{j} HTTP/1.1\r\n" + "Host: does.not.matter\r\n" # But cannot be omitted. + "\r\n", + "timestamp": "1469733493.993", + "body": "" + } + server.addResponse("sessionlog.json", request_header, response_header) + server_nh.append(server) + +#ts = Test.MakeATSProcess("ts", command="traffic_server 2> trace.log", block_for_debug=True) +ts = Test.MakeATSProcess("ts", command="traffic_server 2> trace.log") + +ts.Disk.records_config.update({ + 'proxy.config.diags.debug.enabled': 1, + 'proxy.config.diags.debug.tags': 'http|dns|parent|next_hop|host_statuses|hostdb', + 'proxy.config.dns.nameservers': f"127.0.0.1:{dns.Variables.Port}", # Only nameservers if resolv_conf NULL. + 'proxy.config.dns.resolv_conf': "NULL", # This defaults to /etc/resvolv.conf (OS namesevers) if not NULL. + 'proxy.config.http.cache.http': 0, + 'proxy.config.http.uncacheable_requests_bypass_parent': 0, + 'proxy.config.http.no_dns_just_forward_to_parent': 1, + 'proxy.config.http.parent_proxy.mark_down_hostdb': 0, + 'proxy.config.http.parent_proxy.self_detect': 0, +}) + +ts.Disk.File(ts.Variables.CONFIGDIR + "/strategies.yaml", id="strategies", typename="ats:config") +s = ts.Disk.strategies +s.AddLine("groups:") +s.AddLine(" - &g1") +for i in range(num_nh): + dns.addRecords(records={f"next_hop{i}": ["127.0.0.1"]}) + s.AddLine(f" - host: next_hop{i}") + s.AddLine(f" protocol:") + s.AddLine(f" - scheme: http") + s.AddLine(f" port: {server_nh[i].Variables.Port}") + #s.AddLine(f" health_check_url: http://next_hop{i}:{server_nh[i].Variables.Port}";) + s.AddLine(f" weight: 1.0") +s.AddLine("") +s.AddLine("strategies:") +s.AddLine(" - strategy: the-strategy") +s.AddLine(" policy: consistent_hash") +s.AddLine(" hash_key: path") +s.AddLine(" go_direct: false") +s.AddLine(" parent_is_proxy: true") +s.AddLine(" ignore_self_detect: true") +s.AddLine(" groups:") +s.AddLine(" - *g1") +s.AddLine(" scheme: http") +#s.AddLine(" fallover:") +#s.AddLine(" max_simple_retries: 2") +#s.AddLine(" ring_mode: exhaust_ring") +#s.AddLine(" response_codes:") +#s.AddLine(" - 404") +#s.AddLine(" health_check:") +#s.AddLine(" - passive") Review comment: There's three places where there is commented out code in this test. We should probably either remove them or add comments above them explaining why they are being left in commented out (for instance, if they can be useful for debugging if something's going wrong). -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected]
