Skip to content

Commit 2fad77a

Browse files
authored
Merge branch 'main' into mbkkt/fix-knn-docs
2 parents 90a09a9 + ad5b288 commit 2fad77a

File tree

1,831 files changed

+106934
-77628
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,831 files changed

+106934
-77628
lines changed

.github/TESTOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
/ydb/core/tx/datashard @ydb-platform/datashard
1414
/ydb/core/mon_alloc @ydb-platform/datashard
1515
/ydb/core/tx/coordinator @ydb-platform/datashard
16+
/ydb/core/statistics @ydb-platform/datashard
1617

1718
#Column Tables Development Team @zverevgeny TEAM:@ydb-platform/cs
1819
/ydb/core/tx/columnshard @ydb-platform/cs

.github/actions/test_ya/action.yml

Lines changed: 31 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,34 @@ runs:
8383
mkdir -p $PUBLIC_DIR
8484
8585
echo "LAST_JUNIT_REPORT_XML=$PUBLIC_DIR/last_junit.xml" >> $GITHUB_ENV
86-
echo "TESTMO_URL=${{ inputs.testman_url }}" >> $GITHUB_ENV
86+
export TESTMO_URL=${{ inputs.testman_url }}
87+
echo "TESTMO_URL=$TESTMO_URL" >> $GITHUB_ENV
8788
echo "SUMMARY_LINKS=$PUBLIC_DIR/summary_links.txt" >> $GITHUB_ENV
8889
echo "BUILD_PRESET=${{ inputs.build_preset }}" >> $GITHUB_ENV
8990
9091
python3 -m pip install ydb ydb[yc] codeowners
9192
93+
if [ ${{ inputs.testman_token }} ]; then
94+
TESTMO_PROXY_ADDR=127.0.0.1:8888
95+
openssl req -x509 -newkey rsa:2048 \
96+
-keyout $TMP_DIR/key.pem -out $TMP_DIR/cert.pem \
97+
-sha256 -days 1 -nodes -subj "/CN=127.0.0.1"
98+
99+
TESTMO_TOKEN=${{ inputs.testman_token }} ./ydb/ci/testmo-proxy/testmo-proxy.py -l $TESTMO_PROXY_ADDR \
100+
--cert-file "$TMP_DIR/cert.pem" \
101+
--cert-key "$TMP_DIR/key.pem" \
102+
--target-timeout 3,60 \
103+
--max-request-time 200 \
104+
"$TESTMO_URL" > $PUBLIC_DIR/testmo_proxy.log 2>&1 &
105+
106+
TESTMO_PROXY_PID=$!
107+
echo "TESTMO_PROXY_ADDR=$TESTMO_PROXY_ADDR" >> $GITHUB_ENV
108+
echo "TESTMO_PROXY_PID=$TESTMO_PROXY_PID" >> $GITHUB_ENV
109+
110+
# testmo rejects self-signed cert without this setting
111+
echo "NODE_TLS_REJECT_UNAUTHORIZED=0" >> $GITHUB_ENV
112+
fi
113+
92114
- name: ya build and test
93115
id: build
94116
shell: bash
@@ -260,7 +282,7 @@ runs:
260282
TESTMO_TOKEN=${{ inputs.testman_token }} testmo automation:resources:add-link --name build --url "$TESTMO_RUN_URL" --resources testmo.json
261283
TESTMO_TOKEN=${{ inputs.testman_token }} testmo automation:resources:add-field --name git-sha --type string --value "${GITHUB_SHA:0:7}" --resources testmo.json
262284
TESTMO_RUN_ID=$(
263-
TESTMO_TOKEN=${{ inputs.testman_token }} testmo automation:run:create --instance "$TESTMO_URL" --project-id ${{ inputs.testman_project_id }} \
285+
TESTMO_TOKEN=${{ inputs.testman_token }} testmo automation:run:create --instance "https://$TESTMO_PROXY_ADDR" --project-id ${{ inputs.testman_project_id }} \
264286
--name "$TESTMO_RUN_NAME" --source "$TESTMO_SOURCE" --resources testmo.json \
265287
--tags "$TESTMO_BRANCH_TAG" --tags "$TESTMO_EXTRA_TAG"
266288
)
@@ -362,7 +384,7 @@ runs:
362384

363385
# upload tests results to YDB
364386
ydb_upload_run_name="${TESTMO_RUN_NAME// /"_"}"
365-
result=`.github/scripts/upload_tests_results.py --test-results-file ${CURRENT_JUNIT_XML_PATH} --run-timestamp $(date +%s) --commit $(git rev-parse HEAD) --build-type ${BUILD_PRESET} --pull $ydb_upload_run_name --job-name "${{ github.workflow }}" --job-id "${{ github.run_id }}" --branch ${GITHUB_REF_NAME}`
387+
result=`.github/scripts/analytics/upload_tests_results.py --test-results-file ${CURRENT_JUNIT_XML_PATH} --run-timestamp $(date +%s) --commit $(git rev-parse HEAD) --build-type ${BUILD_PRESET} --pull $ydb_upload_run_name --job-name "${{ github.workflow }}" --job-id "${{ github.run_id }}" --branch ${GITHUB_REF_NAME}`
366388

367389
if [ ${{ inputs.testman_token }} ]; then
368390
# finish testme session
@@ -373,29 +395,12 @@ runs:
373395
.github/scripts/tests/split-junit.py -o "$TESTMO_JUNIT_REPORT_PARTS" "$CURRENT_JUNIT_XML_PATH"
374396
# archive unitest reports (transformed)
375397
tar -C $TESTMO_JUNIT_REPORT_PARTS/.. -czf $PUBLIC_DIR/junit_parts.xml.tar.gz $(basename $TESTMO_JUNIT_REPORT_PARTS)
376-
377-
TESTMO_PROXY_ADDR=127.0.0.1:8888
378-
379-
openssl req -x509 -newkey rsa:2048 \
380-
-keyout $TMP_DIR/key.pem -out $TMP_DIR/cert.pem \
381-
-sha256 -days 1 -nodes -subj "/CN=127.0.0.1"
382-
383-
TESTMO_TOKEN=${{ inputs.testman_token }} ./ydb/ci/testmo-proxy/testmo-proxy.py -l $TESTMO_PROXY_ADDR \
384-
--cert-file "$TMP_DIR/cert.pem" \
385-
--cert-key "$TMP_DIR/key.pem" \
386-
--target-timeout 3,10 \
387-
--max-request-time 55 \
388-
"$TESTMO_URL" &
389-
390-
testmo_proxy_pid=$!
391398

392-
TESTMO_TOKEN=${{ inputs.testman_token }} NODE_TLS_REJECT_UNAUTHORIZED=0 testmo automation:run:submit-thread \
399+
TESTMO_TOKEN=${{ inputs.testman_token }} testmo automation:run:submit-thread \
393400
--instance "https://$TESTMO_PROXY_ADDR" --run-id "$TESTMO_RUN_ID" \
394401
--results "$TESTMO_JUNIT_REPORT_PARTS/*.xml"
395-
396-
kill $testmo_proxy_pid
397402

398-
TESTMO_TOKEN=${{ inputs.testman_token }} testmo automation:run:complete --instance "$TESTMO_URL" --run-id $TESTMO_RUN_ID
403+
TESTMO_TOKEN=${{ inputs.testman_token }} testmo automation:run:complete --instance "https://$TESTMO_PROXY_ADDR" --run-id $TESTMO_RUN_ID || true
399404
echo "runid=" >> $GITHUB_OUTPUT
400405
fi
401406

@@ -435,7 +440,10 @@ runs:
435440
shell: bash
436441
run: |
437442
if [ ${{ steps.build.outputs.runid }} ]; then
438-
TESTMO_TOKEN=${{ inputs.testman_token }} testmo automation:run:complete --instance "$TESTMO_URL" --run-id ${{ steps.build.outputs.runid }}
443+
TESTMO_TOKEN=${{ inputs.testman_token }} testmo automation:run:complete --instance "https://$TESTMO_PROXY_ADDR" --run-id ${{ steps.build.outputs.runid }} || true
444+
fi
445+
if [ ${{ inputs.testman_token }} ]; then
446+
kill $TESTMO_PROXY_PID
439447
fi
440448
- name: analyze tests results
441449
shell: bash

.github/config/muted_ya.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,16 @@ ydb/core/kqp/ut/query KqpLimits.QueryReplySize
1717
ydb/core/kqp/ut/query KqpQuery.QueryTimeout
1818
ydb/core/kqp/ut/scan KqpRequestContext.TraceIdInErrorMessage
1919
ydb/core/kqp/ut/scheme [*/*]*
20+
ydb/core/kqp/ut/scheme KqpOlapScheme.DropThenAddColumn
2021
ydb/core/kqp/ut/scheme KqpOlapScheme.TenThousandColumns
2122
ydb/core/kqp/ut/scheme KqpScheme.AlterAsyncReplication
2223
ydb/core/kqp/ut/scheme KqpScheme.QueryWithAlter
2324
ydb/core/kqp/ut/service [*/*]*
2425
ydb/core/kqp/ut/service KqpQueryService.ExecuteQueryPgTableSelect
2526
ydb/core/kqp/ut/service KqpQueryService.QueryOnClosedSession
2627
ydb/core/kqp/ut/service KqpService.CloseSessionsWithLoad
28+
ydb/core/kqp/ut/service KqpQueryService.TableSink_OlapRWQueries
29+
ydb/core/kqp/ut/tx KqpSnapshotRead.ReadOnlyTxWithIndexCommitsOnConcurrentWrite+withSink
2730
ydb/core/persqueue/ut [*/*]*
2831
ydb/core/persqueue/ut TPQTest.*DirectRead*
2932
ydb/core/persqueue/ut/ut_with_sdk [*/*]*
@@ -59,7 +62,6 @@ ydb/public/sdk/cpp/client/ydb_persqueue_public/ut/with_offset_ranges_mode_ut [*/
5962
ydb/public/sdk/cpp/client/ydb_persqueue_public/ut/with_offset_ranges_mode_ut RetryPolicy.TWriteSession_TestBrokenPolicy
6063
ydb/public/sdk/cpp/client/ydb_topic/ut [*/*]*
6164
ydb/public/sdk/cpp/client/ydb_topic/ut BasicUsage.ReadSessionCorrectClose
62-
ydb/public/sdk/cpp/client/ydb_topic/ut BasicUsage.WriteRead
6365
ydb/public/sdk/cpp/client/ydb_topic/ut TSettingsValidation.TestDifferentDedupParams
6466
ydb/services/datastreams/ut DataStreams.TestGetRecordsStreamWithSingleShard
6567
ydb/services/datastreams/ut DataStreams.TestPutRecordsOfAnauthorizedUser

.github/scripts/analytics/flaky_tests_history.py

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,17 @@
1515
config_file_path = f"{dir}/../../config/ydb_qa_db.ini"
1616
config.read(config_file_path)
1717

18-
build_preset = os.environ.get("build_preset")
19-
branch = os.environ.get("branch_to_compare")
2018

2119
DATABASE_ENDPOINT = config["QA_DB"]["DATABASE_ENDPOINT"]
2220
DATABASE_PATH = config["QA_DB"]["DATABASE_PATH"]
2321

2422

2523
def create_tables(pool, table_path):
26-
print(f"> create table: {table_path}")
24+
print(f"> create table if not exists:'{table_path}'")
2725

2826
def callee(session):
2927
session.execute_scheme(f"""
30-
CREATE table `{table_path}` (
28+
CREATE table IF NOT EXISTS `{table_path}` (
3129
`test_name` Utf8 NOT NULL,
3230
`suite_folder` Utf8 NOT NULL,
3331
`full_name` Utf8 NOT NULL,
@@ -154,18 +152,18 @@ def main():
154152
from `test_results/test_runs_column`
155153
where
156154
status in ('failure','mute')
157-
and job_name in ('Nightly-run', 'Postcommit_relwithdebinfo')
158-
and build_type = 'relwithdebinfo' and
159-
run_timestamp >= Date('{last_date}') -{history_for_n_day}*Interval("P1D")
155+
and job_name in ('Nightly-run', 'Postcommit_relwithdebinfo','Postcommit_asan')
156+
and branch = 'main'
157+
and run_timestamp >= Date('{last_date}') -{history_for_n_day}*Interval("P1D")
160158
) as tests_with_fails
161159
cross join (
162160
select
163161
DISTINCT DateTime::MakeDate(run_timestamp) as date_base
164162
from `test_results/test_runs_column`
165163
where
166164
status in ('failure','mute')
167-
and job_name in ('Nightly-run', 'Postcommit_relwithdebinfo')
168-
and build_type = 'relwithdebinfo'
165+
and job_name in ('Nightly-run', 'Postcommit_relwithdebinfo','Postcommit_asan')
166+
and branch = 'main'
169167
and run_timestamp>= Date('{last_date}')
170168
) as date_list
171169
) as test_and_date

0 commit comments

Comments
 (0)