Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: remove replace table level metrics with aggregate metrics #740

Merged
merged 15 commits into from
Mar 20, 2023
Merged

feat: remove replace table level metrics with aggregate metrics #740

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
8a021fc
feat: remove metrics on table level
ShiKaiWi Mar 15, 2023
9716d7f
expose the log of ceresdb in integration tests
ShiKaiWi Mar 16, 2023
8d3df79
upload cluster outlog
ShiKaiWi Mar 16, 2023
4010832
redirect logs from ceresdb container in integration tests
ShiKaiWi Mar 16, 2023
1d51e72
always redirect logs
ShiKaiWi Mar 16, 2023
fd42383
refactor the integration tests of cluster env
ShiKaiWi Mar 16, 2023
039d312
refactor integration tests
ShiKaiWi Mar 17, 2023
eca62e6
fix recursive call
ShiKaiWi Mar 17, 2023
63c20e9
fix integration tests
ShiKaiWi Mar 17, 2023
d6e1735
adjust ceresmeta bin path
ShiKaiWi Mar 17, 2023
ee3dc1f
fix panic for partition table metrics
ShiKaiWi Mar 17, 2023
703a582
update standalone config
ShiKaiWi Mar 17, 2023
4b42e98
update root Makefile
ShiKaiWi Mar 17, 2023
e9d60e1
fix ci
ShiKaiWi Mar 17, 2023
aa3823e
only clone the lastest commit of ceresmeta
ShiKaiWi Mar 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 3 additions & 20 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,17 +130,6 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 60
steps:
- name: Download CeresMeta Code
uses: actions/checkout@v3
with:
repository: CeresDB/ceresmeta
ref: refs/heads/main
- name: Build CeresMeta Docker image
run: docker build -t ${CERESMETA_IMAGE_NAME} .
- name: Add CeresDB Hosts
run: |
sudo echo "127.0.0.1 ceresdb0" | sudo tee -a /etc/hosts
sudo echo "127.0.0.1 ceresdb1" | sudo tee -a /etc/hosts
- uses: actions/checkout@v3
with:
submodules: true
Expand All @@ -166,14 +155,6 @@ jobs:
run: |
sudo apt update
sudo apt install --yes protobuf-compiler
- name: Build CeresDB
run: |
make build-debug
- name: Copy Target
run: |
cp ./target/debug/ceresdb-server ./ceresdb-server
- name: Build CeresDB Docker Image
run: docker build -f ./Dockerfile-CI -t ${CERESDB_IMAGE_NAME} .
- name: Run black-box tests
run: |
make integration-test
Expand All @@ -186,7 +167,9 @@ jobs:
name: CI-${{ github.head_ref }}.${{ github.sha }}
path: |
/tmp/ceresdb-stdout.log
/tmp/ceresdb-stderr.log
/tmp/ceresmeta.log
/tmp/ceresdb-stdout-0.log
/tmp/ceresdb-stdout-1.log

sdk-test:
name: sdk-test
Expand Down
23 changes: 23 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 0 additions & 25 deletions Dockerfile-CI
View file
Open in desktop

This file was deleted.

8 changes: 2 additions & 6 deletions analytic_engine/src/instance/flush_compaction.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,8 +390,7 @@ impl Instance {

// Start flush duration timer.
let local_metrics = table_data.metrics.local_flush_metrics();
local_metrics.observe_memtables_num(mems_to_flush.len());
let _timer = local_metrics.flush_duration_histogram.start_timer();
let _timer = local_metrics.start_flush_timer();
self.dump_memtables(table_data, request_id, &mems_to_flush)
.await?;

Expand Down Expand Up @@ -807,10 +806,7 @@ impl SpaceStore {
}

// metrics
let _timer = table_data
.metrics
.compaction_duration_histogram
.start_timer();
let _timer = table_data.metrics.start_compaction_timer();
table_data
.metrics
.compaction_observe_sst_num(input.files.len());
Expand Down
4 changes: 2 additions & 2 deletions analytic_engine/src/table/data.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ impl TableData {
let memtable_factory = Arc::new(SkiplistMemTableFactory);
let purge_queue = purger.create_purge_queue(space_id, request.table_id);
let current_version = TableVersion::new(purge_queue);
let metrics = Metrics::new(&request.table_name);
let metrics = Metrics::default();

Ok(Self {
id: request.table_id,
Expand Down Expand Up @@ -241,7 +241,7 @@ impl TableData {
let memtable_factory = Arc::new(SkiplistMemTableFactory);
let purge_queue = purger.create_purge_queue(add_meta.space_id, add_meta.table_id);
let current_version = TableVersion::new(purge_queue);
let metrics = Metrics::new(&add_meta.table_name);
let metrics = Metrics::default();

Ok(Self {
id: add_meta.table_id,
Expand Down
Loading