From d4659c629bd2674972f1115992db92c0c5dae378 Mon Sep 17 00:00:00 2001 From: aminst Date: Sun, 30 Jun 2024 10:26:19 -0400 Subject: [PATCH] Update namings --- README.md | 16 ++++---- ansible/deploy.yaml | 38 +++++++++---------- ansible/experiment.yaml | 4 +- ansible/templates/oblishard-router.service.j2 | 12 ------ ...rvice.j2 => treebeard-oramnode.service.j2} | 8 ++-- ansible/templates/treebeard-router.service.j2 | 12 ++++++ ...vice.j2 => treebeard-shardnode.service.j2} | 12 +++--- api/oramnode.proto | 2 +- api/router.proto | 2 +- api/shardnode.proto | 2 +- cmd/client/main.go | 8 ++-- cmd/oramnode/main.go | 10 ++--- cmd/router/main.go | 10 ++--- cmd/shardnode/main.go | 10 ++--- go.mod | 2 +- pkg/client/client.go | 6 +-- pkg/e2e/e2e_test.go | 10 ++--- pkg/oramnode/client.go | 6 +-- pkg/oramnode/server.go | 10 ++--- pkg/oramnode/server_test.go | 8 ++-- pkg/router/client.go | 6 +-- pkg/router/epoch.go | 8 ++-- pkg/router/epoch_test.go | 2 +- pkg/router/server.go | 6 +-- pkg/rpc/context_test.go | 2 +- pkg/shardnode/batching.go | 4 +- pkg/shardnode/client.go | 6 +-- pkg/shardnode/client_test.go | 4 +- pkg/shardnode/server.go | 10 ++--- pkg/shardnode/server_test.go | 4 +- pkg/storage/storage.go | 4 +- pkg/storage/storage_helper_test.go | 2 +- pkg/storage/storage_test.go | 2 +- pkg/utils/hash_test.go | 2 +- 34 files changed, 125 insertions(+), 125 deletions(-) delete mode 100644 ansible/templates/oblishard-router.service.j2 rename ansible/templates/{oblishard-oramnode.service.j2 => treebeard-oramnode.service.j2} (79%) create mode 100644 ansible/templates/treebeard-router.service.j2 rename ansible/templates/{oblishard-shardnode.service.j2 => treebeard-shardnode.service.j2} (72%) diff --git a/README.md b/README.md index 7614027..1df114b 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -# Oblishard [![Github Actions](https://github.com/dsg-uwaterloo/oblishard/actions/workflows/go.yml/badge.svg)](https://github.com/dsg-uwaterloo/oblishard/actions/workflows/go.yml) -Welcome to **Oblishard**, a fault-tolerant and highly scalable Oblivious RAM (ORAM) data store designed to provide strong security guarantees by hiding access patterns from the storage server and randomizing client access. +# Treebeard [![Github Actions](https://github.com/dsg-uwaterloo/treebeard/actions/workflows/go.yml/badge.svg)](https://github.com/dsg-uwaterloo/treebeard/actions/workflows/go.yml) +Welcome to **Treebeard**, a fault-tolerant and highly scalable Oblivious RAM (ORAM) data store designed to provide strong security guarantees by hiding access patterns from the storage server and randomizing client access. ## Key Features: -* **Scalability**: Oblishard is designed with horizontal scalability in mind, enabling scaling the system without leaking security information. -* **Fault Tolerance**: Using the Raft consensus algorithm, Oblishard ensures the resilience of your data store even in the face of node crashes or failures, enhancing the overall reliability of your system. -* **High Throughput**: Oblishard achieves high-throughput performance, ensuring that your applications can handle large volumes of data seamlessly and efficiently. -* **Configurable**: Oblishard recognizes the diverse needs of different projects and offers a high level of configurability to adapt to your specific requirements. -* **Easy to Deploy**: We've designed the setup of Oblishard to be straightforward, ensuring that you can integrate our secure and high-performance data store effortlessly into your projects. -* **Easy to Extend**: Oblishard's modular architecture makes it easy to extend functionality. You can add new storage layers to Oblishard to support different use cases. +* **Scalability**: Treebeard is designed with horizontal scalability in mind, enabling scaling the system without leaking security information. +* **Fault Tolerance**: Using the Raft consensus algorithm, Treebeard ensures the resilience of your data store even in the face of node crashes or failures, enhancing the overall reliability of your system. +* **High Throughput**: Treebeard achieves high-throughput performance, ensuring that your applications can handle large volumes of data seamlessly and efficiently. +* **Configurable**: Treebeard recognizes the diverse needs of different projects and offers a high level of configurability to adapt to your specific requirements. +* **Easy to Deploy**: We've designed the setup of Treebeard to be straightforward, ensuring that you can integrate our secure and high-performance data store effortlessly into your projects. +* **Easy to Extend**: Treebeard's modular architecture makes it easy to extend functionality. You can add new storage layers to Treebeard to support different use cases. ## Installation ### Protocol Buffers diff --git a/ansible/deploy.yaml b/ansible/deploy.yaml index e58ca95..499f353 100644 --- a/ansible/deploy.yaml +++ b/ansible/deploy.yaml @@ -33,16 +33,16 @@ - python3-docker - socat - - name: Create oblishard directory + - name: Create treebeard directory ansible.builtin.file: - path: /root/oblishard + path: /root/treebeard state: directory mode: '0755' - name: Remove previous log files ansible.builtin.shell: cmd: find . -name "*.log" -delete - chdir: /root/oblishard + chdir: /root/treebeard - name: Include endpoints as vars ansible.builtin.include_vars: @@ -61,11 +61,11 @@ - name: Move Jaeger file template: src: ./templates/docker-compose.yaml.j2 - dest: /root/oblishard/jaeger.yaml + dest: /root/treebeard/jaeger.yaml - name: Run Jaeger shell: cmd: "docker compose -f jaeger.yaml up -d" - chdir: /root/oblishard + chdir: /root/treebeard - name: Create Socat reverse proxy service template: src: templates/socat.service.j2 @@ -125,7 +125,7 @@ - name: Create new directories ansible.builtin.file: - path: "{{ '/root/oblishard/' + item[0] + '/' + item[1].id | string + '/' + item[1].replicaid | default('') | string }}" + path: "{{ '/root/treebeard/' + item[0] + '/' + item[1].id | string + '/' + item[1].replicaid | default('') | string }}" state: directory mode: '0755' delegate_to: "{{ item[1].deploy_host }}" @@ -139,7 +139,7 @@ - name: Copy executables ansible.builtin.copy: src: "../cmd/{{ item[0] }}/{{ item[0] }}" - dest: "{{ '/root/oblishard/' + item[0] + '/' + item[0] }}" + dest: "{{ '/root/treebeard/' + item[0] + '/' + item[0] }}" mode: '0777' delegate_to: "{{ item[1].deploy_host }}" loop: >- @@ -152,31 +152,31 @@ - name: Copy client ansible.builtin.copy: src: "../cmd/client/client" - dest: "/root/oblishard/" + dest: "/root/treebeard/" mode: '0777' - name: Copy configs ansible.builtin.copy: src: "{{ experiment_path }}/{{ item[0] }}" - dest: "/root/oblishard/{{ item[0] }}" + dest: "/root/treebeard/{{ item[0] }}" mode: '0666' delegate_to: "{{ item[1] }}" loop: "{{ ['router_endpoints.yaml', 'shardnode_endpoints.yaml', 'oramnode_endpoints.yaml', 'redis_endpoints.yaml', 'parameters.yaml', 'trace.txt'] | product(groups['all']) | list }}" - name: Create oramnode systemd services template: - src: templates/oblishard-oramnode.service.j2 - dest: "/lib/systemd/system/oblishard-oramnode-{{ item.id }}-{{ item.replicaid }}.service" + src: templates/treebeard-oramnode.service.j2 + dest: "/lib/systemd/system/treebeard-oramnode-{{ item.id }}-{{ item.replicaid }}.service" delegate_to: "{{ item.deploy_host }}" with_items: "{{ oramnode_endpoints.endpoints }}" - name: Stop previous services ansible.builtin.shell: - cmd: systemctl stop oblishard-* + cmd: systemctl stop treebeard-* - name: Start oramnode services ansible.builtin.systemd: - name: "oblishard-oramnode-{{ item.id }}-{{ item.replicaid }}" + name: "treebeard-oramnode-{{ item.id }}-{{ item.replicaid }}" state: restarted daemon_reload: true delegate_to: "{{ item.deploy_host }}" @@ -186,14 +186,14 @@ - name: Create shardnode systemd services template: - src: templates/oblishard-shardnode.service.j2 - dest: "/lib/systemd/system/oblishard-shardnode-{{ item.id }}-{{ item.replicaid }}.service" + src: templates/treebeard-shardnode.service.j2 + dest: "/lib/systemd/system/treebeard-shardnode-{{ item.id }}-{{ item.replicaid }}.service" delegate_to: "{{ item.deploy_host }}" with_items: "{{ shardnode_endpoints.endpoints }}" - name: Start shardnode services ansible.builtin.systemd: - name: "oblishard-shardnode-{{ item.id }}-{{ item.replicaid }}" + name: "treebeard-shardnode-{{ item.id }}-{{ item.replicaid }}" state: restarted daemon_reload: true delegate_to: "{{ item.deploy_host }}" @@ -203,14 +203,14 @@ - name: Create router systemd services template: - src: templates/oblishard-router.service.j2 - dest: "/lib/systemd/system/oblishard-router-{{ item.id }}.service" + src: templates/treebeard-router.service.j2 + dest: "/lib/systemd/system/treebeard-router-{{ item.id }}.service" delegate_to: "{{ item.deploy_host }}" with_items: "{{ router_endpoints.endpoints }}" - name: Start router services ansible.builtin.systemd: - name: "oblishard-router-{{ item.id }}" + name: "treebeard-router-{{ item.id }}" state: restarted daemon_reload: true delegate_to: "{{ item.deploy_host }}" diff --git a/ansible/experiment.yaml b/ansible/experiment.yaml index b6013be..adf6d8b 100644 --- a/ansible/experiment.yaml +++ b/ansible/experiment.yaml @@ -6,9 +6,9 @@ tasks: - name: Run the Client ansible.builtin.shell: - cmd: "/root/oblishard/client -duration 20 -conf /root/oblishard -output /root/oblishard/output.txt -logpath /root/oblishard/client.log" + cmd: "/root/treebeard/client -duration 20 -conf /root/treebeard -output /root/treebeard/output.txt -logpath /root/treebeard/client.log" - name: Get the output ansible.builtin.fetch: - src: "/root/oblishard/output.txt" + src: "/root/treebeard/output.txt" dest: "{{ experiment_output_path }}" flat: yes \ No newline at end of file diff --git a/ansible/templates/oblishard-router.service.j2 b/ansible/templates/oblishard-router.service.j2 deleted file mode 100644 index 300771e..0000000 --- a/ansible/templates/oblishard-router.service.j2 +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Oblishard Router -Requires=network.target -After=syslog.target network.target - -[Service] -Type=simple -ExecStart=/root/oblishard/router/router -routerid {{ item.id }} -ip {{ item.local_bind_ip }} -port {{ item.port }} -conf /root/oblishard/ -logpath /root/oblishard/router/{{ item.id }}/all.log -Restart=on-failure - -[Install] -WantedBy=multi-user.target \ No newline at end of file diff --git a/ansible/templates/oblishard-oramnode.service.j2 b/ansible/templates/treebeard-oramnode.service.j2 similarity index 79% rename from ansible/templates/oblishard-oramnode.service.j2 rename to ansible/templates/treebeard-oramnode.service.j2 index 9ffee05..7390b7b 100644 --- a/ansible/templates/oblishard-oramnode.service.j2 +++ b/ansible/templates/treebeard-oramnode.service.j2 @@ -1,11 +1,11 @@ [Unit] -Description=Oblishard Oramnode +Description=Treebeard Oramnode Requires=network.target After=syslog.target network.target [Service] Type=simple -ExecStart=/root/oblishard/oramnode/oramnode \ +ExecStart=/root/treebeard/oramnode/oramnode \ -oramnodeid {{ item.id }} \ -bindip {{ item.local_bind_ip }} \ -advip {{ item.exposed_ip }} \ @@ -16,8 +16,8 @@ ExecStart=/root/oblishard/oramnode/oramnode \ # this assumes there are 3 replicas (Dangerous assmumption) {{'-joinaddr=' + oramnode_endpoints.endpoints[item.id * 3].exposed_ip + ':' + oramnode_endpoints.endpoints[item.id * 3].port | string }} \ {% endif %} - -conf /root/oblishard/ \ - -logpath {{ '/root/oblishard/oramnode/' + item.id | string + '/' + item.replicaid | string + '/all.log' }} + -conf /root/treebeard/ \ + -logpath {{ '/root/treebeard/oramnode/' + item.id | string + '/' + item.replicaid | string + '/all.log' }} Restart=on-failure [Install] diff --git a/ansible/templates/treebeard-router.service.j2 b/ansible/templates/treebeard-router.service.j2 new file mode 100644 index 0000000..56296cf --- /dev/null +++ b/ansible/templates/treebeard-router.service.j2 @@ -0,0 +1,12 @@ +[Unit] +Description=Treebeard Router +Requires=network.target +After=syslog.target network.target + +[Service] +Type=simple +ExecStart=/root/treebeard/router/router -routerid {{ item.id }} -ip {{ item.local_bind_ip }} -port {{ item.port }} -conf /root/treebeard/ -logpath /root/treebeard/router/{{ item.id }}/all.log +Restart=on-failure + +[Install] +WantedBy=multi-user.target \ No newline at end of file diff --git a/ansible/templates/oblishard-shardnode.service.j2 b/ansible/templates/treebeard-shardnode.service.j2 similarity index 72% rename from ansible/templates/oblishard-shardnode.service.j2 rename to ansible/templates/treebeard-shardnode.service.j2 index 074594d..ca9ea61 100644 --- a/ansible/templates/oblishard-shardnode.service.j2 +++ b/ansible/templates/treebeard-shardnode.service.j2 @@ -1,13 +1,13 @@ [Unit] -Description=Oblishard Shardnode +Description=Treebeard Shardnode Requires=network.target After=syslog.target network.target [Service] Type=simple -StandardOutput=file:/root/oblishard/shardnode/{{ 'shardnode-' + item.id | string + '-' + item.replicaid | string + '.stdout.log' }} -StandardError=file:/root/oblishard/shardnode/{{ 'shardnode-' + item.id | string + '-' + item.replicaid | string + '.stderr.log' }} -ExecStart=/root/oblishard/shardnode/shardnode \ +StandardOutput=file:/root/treebeard/shardnode/{{ 'shardnode-' + item.id | string + '-' + item.replicaid | string + '.stdout.log' }} +StandardError=file:/root/treebeard/shardnode/{{ 'shardnode-' + item.id | string + '-' + item.replicaid | string + '.stderr.log' }} +ExecStart=/root/treebeard/shardnode/shardnode \ -shardnodeid {{ item.id }} \ -bindip {{ item.local_bind_ip }} \ -advip {{ item.exposed_ip }} \ @@ -18,8 +18,8 @@ ExecStart=/root/oblishard/shardnode/shardnode \ # this assumes there are 3 replicas (Dangerous assmumption) {{'-joinaddr=' + shardnode_endpoints.endpoints[item.id * 3].exposed_ip + ':' + shardnode_endpoints.endpoints[item.id * 3].port | string }} \ {% endif %} - -conf /root/oblishard/ \ - -logpath {{ '/root/oblishard/shardnode/' + item.id | string + '/' + item.replicaid | string + '/all.log' }} + -conf /root/treebeard/ \ + -logpath {{ '/root/treebeard/shardnode/' + item.id | string + '/' + item.replicaid | string + '/all.log' }} Restart=on-failure [Install] diff --git a/api/oramnode.proto b/api/oramnode.proto index f7c8fab..ba7c637 100644 --- a/api/oramnode.proto +++ b/api/oramnode.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option go_package = "github.com/dsg-uwaterloo/oblishard/api/oramnode"; +option go_package = "github.com/dsg-uwaterloo/treebeard/api/oramnode"; package oramnode; diff --git a/api/router.proto b/api/router.proto index 8b3a610..45b8c5c 100644 --- a/api/router.proto +++ b/api/router.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option go_package = "github.com/dsg-uwaterloo/oblishard/api/router"; +option go_package = "github.com/dsg-uwaterloo/treebeard/api/router"; package router; diff --git a/api/shardnode.proto b/api/shardnode.proto index 6ca6ed5..6a977ac 100644 --- a/api/shardnode.proto +++ b/api/shardnode.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option go_package = "github.com/dsg-uwaterloo/oblishard/api/shardnode"; +option go_package = "github.com/dsg-uwaterloo/treebeard/api/shardnode"; package shardnode; diff --git a/cmd/client/main.go b/cmd/client/main.go index 33ce66f..adaf6c5 100644 --- a/cmd/client/main.go +++ b/cmd/client/main.go @@ -8,10 +8,10 @@ import ( "path" "time" - "github.com/dsg-uwaterloo/oblishard/pkg/client" - "github.com/dsg-uwaterloo/oblishard/pkg/config" - "github.com/dsg-uwaterloo/oblishard/pkg/tracing" - "github.com/dsg-uwaterloo/oblishard/pkg/utils" + "github.com/dsg-uwaterloo/treebeard/pkg/client" + "github.com/dsg-uwaterloo/treebeard/pkg/config" + "github.com/dsg-uwaterloo/treebeard/pkg/tracing" + "github.com/dsg-uwaterloo/treebeard/pkg/utils" "github.com/rs/zerolog/log" "go.opentelemetry.io/otel" ) diff --git a/cmd/oramnode/main.go b/cmd/oramnode/main.go index 523c5d6..54ebbee 100644 --- a/cmd/oramnode/main.go +++ b/cmd/oramnode/main.go @@ -7,11 +7,11 @@ import ( "os" "path" - "github.com/dsg-uwaterloo/oblishard/pkg/config" - oramnode "github.com/dsg-uwaterloo/oblishard/pkg/oramnode" - "github.com/dsg-uwaterloo/oblishard/pkg/profile" - "github.com/dsg-uwaterloo/oblishard/pkg/tracing" - "github.com/dsg-uwaterloo/oblishard/pkg/utils" + "github.com/dsg-uwaterloo/treebeard/pkg/config" + oramnode "github.com/dsg-uwaterloo/treebeard/pkg/oramnode" + "github.com/dsg-uwaterloo/treebeard/pkg/profile" + "github.com/dsg-uwaterloo/treebeard/pkg/tracing" + "github.com/dsg-uwaterloo/treebeard/pkg/utils" "github.com/rs/zerolog/log" ) diff --git a/cmd/router/main.go b/cmd/router/main.go index 6ee655a..4d55967 100644 --- a/cmd/router/main.go +++ b/cmd/router/main.go @@ -7,11 +7,11 @@ import ( "os" "path" - "github.com/dsg-uwaterloo/oblishard/pkg/config" - "github.com/dsg-uwaterloo/oblishard/pkg/profile" - router "github.com/dsg-uwaterloo/oblishard/pkg/router" - "github.com/dsg-uwaterloo/oblishard/pkg/tracing" - "github.com/dsg-uwaterloo/oblishard/pkg/utils" + "github.com/dsg-uwaterloo/treebeard/pkg/config" + "github.com/dsg-uwaterloo/treebeard/pkg/profile" + router "github.com/dsg-uwaterloo/treebeard/pkg/router" + "github.com/dsg-uwaterloo/treebeard/pkg/tracing" + "github.com/dsg-uwaterloo/treebeard/pkg/utils" "github.com/rs/zerolog/log" ) diff --git a/cmd/shardnode/main.go b/cmd/shardnode/main.go index 3b873ca..401383c 100644 --- a/cmd/shardnode/main.go +++ b/cmd/shardnode/main.go @@ -7,11 +7,11 @@ import ( "os" "path" - "github.com/dsg-uwaterloo/oblishard/pkg/config" - "github.com/dsg-uwaterloo/oblishard/pkg/profile" - shardnode "github.com/dsg-uwaterloo/oblishard/pkg/shardnode" - "github.com/dsg-uwaterloo/oblishard/pkg/tracing" - "github.com/dsg-uwaterloo/oblishard/pkg/utils" + "github.com/dsg-uwaterloo/treebeard/pkg/config" + "github.com/dsg-uwaterloo/treebeard/pkg/profile" + shardnode "github.com/dsg-uwaterloo/treebeard/pkg/shardnode" + "github.com/dsg-uwaterloo/treebeard/pkg/tracing" + "github.com/dsg-uwaterloo/treebeard/pkg/utils" "github.com/rs/zerolog/log" ) diff --git a/go.mod b/go.mod index fefa7d0..098dae0 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/dsg-uwaterloo/oblishard +module github.com/dsg-uwaterloo/treebeard go 1.20 diff --git a/pkg/client/client.go b/pkg/client/client.go index b94bed3..5ee8d12 100644 --- a/pkg/client/client.go +++ b/pkg/client/client.go @@ -7,9 +7,9 @@ import ( "math/rand" "time" - routerpb "github.com/dsg-uwaterloo/oblishard/api/router" - "github.com/dsg-uwaterloo/oblishard/pkg/config" - "github.com/dsg-uwaterloo/oblishard/pkg/rpc" + routerpb "github.com/dsg-uwaterloo/treebeard/api/router" + "github.com/dsg-uwaterloo/treebeard/pkg/config" + "github.com/dsg-uwaterloo/treebeard/pkg/rpc" "github.com/redis/go-redis/v9" "github.com/rs/zerolog/log" "go.opentelemetry.io/otel/trace" diff --git a/pkg/e2e/e2e_test.go b/pkg/e2e/e2e_test.go index a9024ce..1457b27 100644 --- a/pkg/e2e/e2e_test.go +++ b/pkg/e2e/e2e_test.go @@ -5,11 +5,11 @@ import ( "testing" "time" - "github.com/dsg-uwaterloo/oblishard/pkg/client" - "github.com/dsg-uwaterloo/oblishard/pkg/config" - "github.com/dsg-uwaterloo/oblishard/pkg/oramnode" - "github.com/dsg-uwaterloo/oblishard/pkg/router" - "github.com/dsg-uwaterloo/oblishard/pkg/shardnode" + "github.com/dsg-uwaterloo/treebeard/pkg/client" + "github.com/dsg-uwaterloo/treebeard/pkg/config" + "github.com/dsg-uwaterloo/treebeard/pkg/oramnode" + "github.com/dsg-uwaterloo/treebeard/pkg/router" + "github.com/dsg-uwaterloo/treebeard/pkg/shardnode" "github.com/rs/zerolog/log" ) diff --git a/pkg/oramnode/client.go b/pkg/oramnode/client.go index 59090ec..200768e 100644 --- a/pkg/oramnode/client.go +++ b/pkg/oramnode/client.go @@ -6,9 +6,9 @@ import ( "math" "math/rand" - shardnodepb "github.com/dsg-uwaterloo/oblishard/api/shardnode" - "github.com/dsg-uwaterloo/oblishard/pkg/config" - "github.com/dsg-uwaterloo/oblishard/pkg/rpc" + shardnodepb "github.com/dsg-uwaterloo/treebeard/api/shardnode" + "github.com/dsg-uwaterloo/treebeard/pkg/config" + "github.com/dsg-uwaterloo/treebeard/pkg/rpc" "github.com/rs/zerolog/log" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" diff --git a/pkg/oramnode/server.go b/pkg/oramnode/server.go index fac43ba..7835fa3 100644 --- a/pkg/oramnode/server.go +++ b/pkg/oramnode/server.go @@ -8,11 +8,11 @@ import ( "sync/atomic" "time" - pb "github.com/dsg-uwaterloo/oblishard/api/oramnode" - "github.com/dsg-uwaterloo/oblishard/pkg/commonerrs" - "github.com/dsg-uwaterloo/oblishard/pkg/config" - "github.com/dsg-uwaterloo/oblishard/pkg/rpc" - strg "github.com/dsg-uwaterloo/oblishard/pkg/storage" + pb "github.com/dsg-uwaterloo/treebeard/api/oramnode" + "github.com/dsg-uwaterloo/treebeard/pkg/commonerrs" + "github.com/dsg-uwaterloo/treebeard/pkg/config" + "github.com/dsg-uwaterloo/treebeard/pkg/rpc" + strg "github.com/dsg-uwaterloo/treebeard/pkg/storage" "github.com/hashicorp/raft" "github.com/rs/zerolog/log" "go.opentelemetry.io/otel" diff --git a/pkg/oramnode/server_test.go b/pkg/oramnode/server_test.go index bc5f677..eacbabf 100644 --- a/pkg/oramnode/server_test.go +++ b/pkg/oramnode/server_test.go @@ -6,10 +6,10 @@ import ( "sort" "testing" - "github.com/dsg-uwaterloo/oblishard/api/oramnode" - shardnodepb "github.com/dsg-uwaterloo/oblishard/api/shardnode" - "github.com/dsg-uwaterloo/oblishard/pkg/config" - strg "github.com/dsg-uwaterloo/oblishard/pkg/storage" + "github.com/dsg-uwaterloo/treebeard/api/oramnode" + shardnodepb "github.com/dsg-uwaterloo/treebeard/api/shardnode" + "github.com/dsg-uwaterloo/treebeard/pkg/config" + strg "github.com/dsg-uwaterloo/treebeard/pkg/storage" "github.com/hashicorp/raft" "github.com/phayes/freeport" "google.golang.org/grpc" diff --git a/pkg/router/client.go b/pkg/router/client.go index f55bc18..eeaf05b 100644 --- a/pkg/router/client.go +++ b/pkg/router/client.go @@ -4,9 +4,9 @@ import ( "fmt" "math" - shardnodepb "github.com/dsg-uwaterloo/oblishard/api/shardnode" - "github.com/dsg-uwaterloo/oblishard/pkg/config" - "github.com/dsg-uwaterloo/oblishard/pkg/rpc" + shardnodepb "github.com/dsg-uwaterloo/treebeard/api/shardnode" + "github.com/dsg-uwaterloo/treebeard/pkg/config" + "github.com/dsg-uwaterloo/treebeard/pkg/rpc" "github.com/rs/zerolog/log" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" diff --git a/pkg/router/epoch.go b/pkg/router/epoch.go index e820e53..25ee123 100644 --- a/pkg/router/epoch.go +++ b/pkg/router/epoch.go @@ -6,9 +6,9 @@ import ( "sync" "time" - shardnodepb "github.com/dsg-uwaterloo/oblishard/api/shardnode" - "github.com/dsg-uwaterloo/oblishard/pkg/rpc" - utils "github.com/dsg-uwaterloo/oblishard/pkg/utils" + shardnodepb "github.com/dsg-uwaterloo/treebeard/api/shardnode" + "github.com/dsg-uwaterloo/treebeard/pkg/rpc" + utils "github.com/dsg-uwaterloo/treebeard/pkg/utils" "github.com/rs/zerolog/log" "google.golang.org/grpc" ) @@ -87,7 +87,7 @@ type batchResponse struct { } func (e *epochManager) sendBatch(ctx context.Context, shardnodeClient ReplicaRPCClientMap, requestBatch *shardnodepb.RequestBatch, batchResponseChan chan batchResponse) { - log.Debug().Msgf("Sending batch of requests %v to shardnode", requestBatch) + log.Debug().Msgf("Sending batch of %d requests %v to shardnode", len(requestBatch.ReadRequests)+len(requestBatch.WriteRequests), requestBatch) var replicaFuncs []rpc.CallFunc var clients []any for _, client := range shardnodeClient { diff --git a/pkg/router/epoch_test.go b/pkg/router/epoch_test.go index d0f9498..e8e5f82 100644 --- a/pkg/router/epoch_test.go +++ b/pkg/router/epoch_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - shardnodepb "github.com/dsg-uwaterloo/oblishard/api/shardnode" + shardnodepb "github.com/dsg-uwaterloo/treebeard/api/shardnode" "google.golang.org/grpc" ) diff --git a/pkg/router/server.go b/pkg/router/server.go index e9712ad..1ce0b9a 100644 --- a/pkg/router/server.go +++ b/pkg/router/server.go @@ -6,9 +6,9 @@ import ( "net" "time" - pb "github.com/dsg-uwaterloo/oblishard/api/router" - "github.com/dsg-uwaterloo/oblishard/pkg/config" - "github.com/dsg-uwaterloo/oblishard/pkg/rpc" + pb "github.com/dsg-uwaterloo/treebeard/api/router" + "github.com/dsg-uwaterloo/treebeard/pkg/config" + "github.com/dsg-uwaterloo/treebeard/pkg/rpc" "github.com/google/uuid" "github.com/rs/zerolog/log" "go.opentelemetry.io/otel" diff --git a/pkg/rpc/context_test.go b/pkg/rpc/context_test.go index f8f29aa..2dfa36d 100644 --- a/pkg/rpc/context_test.go +++ b/pkg/rpc/context_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/dsg-uwaterloo/oblishard/pkg/rpc" + "github.com/dsg-uwaterloo/treebeard/pkg/rpc" "google.golang.org/grpc" "google.golang.org/grpc/metadata" ) diff --git a/pkg/shardnode/batching.go b/pkg/shardnode/batching.go index 8a5dce1..60c2b61 100644 --- a/pkg/shardnode/batching.go +++ b/pkg/shardnode/batching.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/dsg-uwaterloo/oblishard/api/oramnode" - "github.com/dsg-uwaterloo/oblishard/pkg/utils" + "github.com/dsg-uwaterloo/treebeard/api/oramnode" + "github.com/dsg-uwaterloo/treebeard/pkg/utils" "github.com/rs/zerolog/log" ) diff --git a/pkg/shardnode/client.go b/pkg/shardnode/client.go index c427925..9f45522 100644 --- a/pkg/shardnode/client.go +++ b/pkg/shardnode/client.go @@ -5,9 +5,9 @@ import ( "fmt" "math" - oramnodepb "github.com/dsg-uwaterloo/oblishard/api/oramnode" - "github.com/dsg-uwaterloo/oblishard/pkg/config" - "github.com/dsg-uwaterloo/oblishard/pkg/rpc" + oramnodepb "github.com/dsg-uwaterloo/treebeard/api/oramnode" + "github.com/dsg-uwaterloo/treebeard/pkg/config" + "github.com/dsg-uwaterloo/treebeard/pkg/rpc" "github.com/rs/zerolog/log" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" diff --git a/pkg/shardnode/client_test.go b/pkg/shardnode/client_test.go index 7b665f4..00dd1a8 100644 --- a/pkg/shardnode/client_test.go +++ b/pkg/shardnode/client_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/dsg-uwaterloo/oblishard/api/oramnode" - oramnodepb "github.com/dsg-uwaterloo/oblishard/api/oramnode" + "github.com/dsg-uwaterloo/treebeard/api/oramnode" + oramnodepb "github.com/dsg-uwaterloo/treebeard/api/oramnode" "google.golang.org/grpc" ) diff --git a/pkg/shardnode/server.go b/pkg/shardnode/server.go index 132a553..196a991 100644 --- a/pkg/shardnode/server.go +++ b/pkg/shardnode/server.go @@ -8,11 +8,11 @@ import ( "strconv" "time" - pb "github.com/dsg-uwaterloo/oblishard/api/shardnode" - "github.com/dsg-uwaterloo/oblishard/pkg/commonerrs" - "github.com/dsg-uwaterloo/oblishard/pkg/config" - "github.com/dsg-uwaterloo/oblishard/pkg/rpc" - "github.com/dsg-uwaterloo/oblishard/pkg/storage" + pb "github.com/dsg-uwaterloo/treebeard/api/shardnode" + "github.com/dsg-uwaterloo/treebeard/pkg/commonerrs" + "github.com/dsg-uwaterloo/treebeard/pkg/config" + "github.com/dsg-uwaterloo/treebeard/pkg/rpc" + "github.com/dsg-uwaterloo/treebeard/pkg/storage" "github.com/hashicorp/raft" "github.com/rs/zerolog/log" "go.opentelemetry.io/otel" diff --git a/pkg/shardnode/server_test.go b/pkg/shardnode/server_test.go index c5e8d38..f2a9c3f 100644 --- a/pkg/shardnode/server_test.go +++ b/pkg/shardnode/server_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - oramnodepb "github.com/dsg-uwaterloo/oblishard/api/oramnode" - shardnodepb "github.com/dsg-uwaterloo/oblishard/api/shardnode" + oramnodepb "github.com/dsg-uwaterloo/treebeard/api/oramnode" + shardnodepb "github.com/dsg-uwaterloo/treebeard/api/shardnode" "github.com/hashicorp/raft" "github.com/phayes/freeport" ) diff --git a/pkg/storage/storage.go b/pkg/storage/storage.go index 5763fcb..0be364e 100644 --- a/pkg/storage/storage.go +++ b/pkg/storage/storage.go @@ -10,8 +10,8 @@ import ( "strings" "sync" - "github.com/dsg-uwaterloo/oblishard/pkg/config" - "github.com/dsg-uwaterloo/oblishard/pkg/utils" + "github.com/dsg-uwaterloo/treebeard/pkg/config" + "github.com/dsg-uwaterloo/treebeard/pkg/utils" "github.com/redis/go-redis/v9" "github.com/rs/zerolog/log" ) diff --git a/pkg/storage/storage_helper_test.go b/pkg/storage/storage_helper_test.go index 20ee159..026c54b 100644 --- a/pkg/storage/storage_helper_test.go +++ b/pkg/storage/storage_helper_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/dsg-uwaterloo/oblishard/pkg/config" + "github.com/dsg-uwaterloo/treebeard/pkg/config" "github.com/redis/go-redis/v9" ) diff --git a/pkg/storage/storage_test.go b/pkg/storage/storage_test.go index cc2dae5..d9668a4 100644 --- a/pkg/storage/storage_test.go +++ b/pkg/storage/storage_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/dsg-uwaterloo/oblishard/pkg/config" + "github.com/dsg-uwaterloo/treebeard/pkg/config" "github.com/rs/zerolog/log" ) diff --git a/pkg/utils/hash_test.go b/pkg/utils/hash_test.go index 89cf338..945ff8e 100644 --- a/pkg/utils/hash_test.go +++ b/pkg/utils/hash_test.go @@ -3,7 +3,7 @@ package utils_test import ( "testing" - utils "github.com/dsg-uwaterloo/oblishard/pkg/utils" + utils "github.com/dsg-uwaterloo/treebeard/pkg/utils" ) type hashTest struct {