mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-28 02:21:59 +00:00
2bade7db08
* initial impl * fix env ut * move ut directory * make sure no null proxy resolver is returned by ProxyConfigurationResolverProvider * minor adjustment * add a few tests, still incomplete * add proxy support for url table function * use proxy for select from url as well * remove optional from return type, just returns empty config * fix style * style * black * ohg boy * rm in progress file * god pls don't let me kill anyone * ... * add use_aws guards * remove hard coded s3 proxy resolver * add concurrency-mt-unsafe * aa * black * add logging back * revert change * imrpove code a bit * helper functions and separate tests * for some reason, this env test is not working.. * formatting * :) * clangtidy * lint * revert some stupid things * small test adjusmtments * simplify tests * rename test * remove extra line * freaking style change * simplify a bit * fix segfault & remove an extra call * tightly couple proxy provider with context.. * remove useless include * rename config prefix parameter * simplify provider a bit * organize provider a bit * add a few comments * comment out proxy env tests * fix nullptr in unit tests * make sure old storage proxy config is properly covered without global context instance * move a few functions from class to anonymous namespace * fix no fallback for specific storage conf * change API to accept http method instead of bool * implement http/https distinction in listresolver, any still not implemented * implement http/https distinction in remote resolver * progress on code, improve tests and add url function working test * use protcol instead of method for http and https * small fix * few more adjustments * fix style * black * move enum to proxyconfiguration * wip * fix build * fix ut * delete atomicroundrobin class * remove stale include * add some tests.. need to spend some more time on the design.. * change design a bit * progress * use existing context for tests * rename aux function and fix ut * .. * rename test * try to simplify tests a bit * simplify tests a bit more * attempt to fix tests, accept more than one remote resolver * use proper log id * try waiting for resolver * proper wait logic * black * empty * address a few comments * refactor tests * remove old tests * baclk * use RAII to set/unset env * black * clang tidy * fix env proxy not respecting any * use log trace * fix wrong logic in getRemoteREsolver * fix wrong logic in getRemoteREsolver * fix test * remove unwanted code * remove ClientConfigurationperRequest and auxilary classes * remove unwanted code * remove adapter test * few adjustments and add test for s3 storage conf with new proxy settings * black * use chassert for context * Add getenv comment
89 lines
2.5 KiB
Python
89 lines
2.5 KiB
Python
import os
|
|
import time
|
|
|
|
|
|
def check_proxy_logs(
|
|
cluster, proxy_instance, protocol, bucket, http_methods={"POST", "PUT", "GET"}
|
|
):
|
|
for i in range(10):
|
|
logs = cluster.get_container_logs(proxy_instance)
|
|
# Check with retry that all possible interactions with Minio are present
|
|
for http_method in http_methods:
|
|
if (
|
|
logs.find(http_method + f" {protocol}://minio1:9001/root/data/{bucket}")
|
|
>= 0
|
|
):
|
|
return
|
|
time.sleep(1)
|
|
else:
|
|
assert False, f"{http_methods} method not found in logs of {proxy_instance}"
|
|
|
|
|
|
def wait_resolver(cluster):
|
|
for i in range(10):
|
|
response = cluster.exec_in_container(
|
|
cluster.get_container_id("resolver"),
|
|
[
|
|
"curl",
|
|
"-s",
|
|
f"http://resolver:8080/hostname",
|
|
],
|
|
nothrow=True,
|
|
)
|
|
if response == "proxy1":
|
|
return
|
|
time.sleep(i)
|
|
else:
|
|
assert False, "Resolver is not up"
|
|
|
|
|
|
# Runs simple proxy resolver in python env container.
|
|
def run_resolver(cluster, current_dir):
|
|
container_id = cluster.get_container_id("resolver")
|
|
cluster.copy_file_to_container(
|
|
container_id,
|
|
os.path.join(current_dir, "proxy-resolver", "resolver.py"),
|
|
"resolver.py",
|
|
)
|
|
cluster.exec_in_container(container_id, ["python", "resolver.py"], detach=True)
|
|
|
|
wait_resolver(cluster)
|
|
|
|
|
|
def build_s3_endpoint(protocol, bucket):
|
|
return f"{protocol}://minio1:9001/root/data/{bucket}/test.csv"
|
|
|
|
|
|
def perform_simple_queries(node, minio_endpoint):
|
|
node.query(
|
|
f"""
|
|
INSERT INTO FUNCTION
|
|
s3('{minio_endpoint}', 'minio', 'minio123', 'CSV', 'key String, value String')
|
|
VALUES ('color','red'),('size','10')
|
|
"""
|
|
)
|
|
|
|
assert (
|
|
node.query(
|
|
f"SELECT * FROM s3('{minio_endpoint}', 'minio', 'minio123', 'CSV') FORMAT Values"
|
|
)
|
|
== "('color','red'),('size','10')"
|
|
)
|
|
|
|
assert (
|
|
node.query(
|
|
f"SELECT * FROM s3('{minio_endpoint}', 'minio', 'minio123', 'CSV') FORMAT Values"
|
|
)
|
|
== "('color','red'),('size','10')"
|
|
)
|
|
|
|
|
|
def simple_test(cluster, proxies, protocol, bucket):
|
|
minio_endpoint = build_s3_endpoint(protocol, bucket)
|
|
node = cluster.instances[f"{bucket}"]
|
|
|
|
perform_simple_queries(node, minio_endpoint)
|
|
|
|
for proxy in proxies:
|
|
check_proxy_logs(cluster, proxy, protocol, bucket)
|