Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion benchmarking/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.3.2
v0.3.3
2 changes: 0 additions & 2 deletions deployment/entity-service/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ metadata:
labels:
{{- include "es.release_labels" . | indent 4 }}
data:
DEBUG: {{ required "workers.debug is required." .Values.workers.debug | quote }}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what was that for? Why don't we need it anymore?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The debug flag was removed ages ago from the python code and settings. Has just taken a while to remove all traces - now we configure logging in a different config map.


CONNEXION_STRICT_VALIDATION: "true"
CONNEXION_RESPONSE_VALIDATION: "true"

Expand Down
2 changes: 0 additions & 2 deletions deployment/entity-service/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -204,8 +204,6 @@ workers:
## Worker configuration
## These settings populate the deployment's configmap.

debug: false

## Desired task size in "number of comparisons"
## Note there is some overhead creating a task and a single dedicated cpu core can do between 50M and 100M
## comparisons per second, so much lower that 100M isn't generally worth splitting across celery workers.
Expand Down
2 changes: 1 addition & 1 deletion deployment/jobs/benchmark/timing-test-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
mountPath: /cache
containers:
- name: entitytester
image: data61/anonlink-benchmark:v0.3.2
image: data61/anonlink-benchmark:v0.3.3
env:
- name: SERVER
value: "https://anonlink.easd.data61.xyz"
Expand Down
30 changes: 27 additions & 3 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,34 @@ Next Version


Version 1.13.0-beta2
-------------------
--------------------

- Encodings are now stored in Postgres database instead of files in an object store.
- Initial support for user supplied blocking implemented.
Adds support for users to supply blocking information along with encodings. Data can now be uploaded to
an object store and pulled by the Anonlink Entity Service instead of uploaded via the REST API.
This release includes substantial internal changes as encodings are now stored in Postgres instead of
the object store.

- Feature to pull data from an object store and create temporary upload credentials. #537, #544, #551
- Blocking implementation #510 #527,
- Benchmarking #478, #541
- Encodings are now stored in Postgres database instead of files in an object store. #516, #522
- Start to add integration tests to complement our end to end tests. #520, #528
- Use anonlink-client instead of clkhash #536
- Use Python 3.8 in base image. #518
- A base image is now used for all our Docker images. #506, #511, #517, #519
- Binary encodings now stored internally with their encoding id. #505
- REST API implementation for accepting clknblocks #503
- Update Open API spec to version 3. Add Blocking API #479
- CI Updates #476
- Chart updates #496, #497, #539
- Documentation updates (production deployment, debugging with PyCharm) #473, #504
- Fix Jaeger #500, #523

Misc changes/fixes:
- Detect invalid encoding size as early as possible #507
- Use local benchmark cache #531
- Cleanup docker-compose #533, #534, #547
- Calculate number of comparisons accounting for user supplied blocks. #543

Version 1.13.0-beta
-------------------
Expand Down
6 changes: 3 additions & 3 deletions e2etests/tests/test_project_uploads.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ def test_project_upload_external_encodings(requests, a_project, binary_test_file
def test_project_upload_external_data(requests, a_blocking_project, binary_test_file_path):
project = a_blocking_project
blocking_data = json.dumps(
{str(encoding_id): [str(encoding_id % 2), str(encoding_id % 3)] for encoding_id in range(1000)}).encode()
{str(encoding_id): list({str(encoding_id % 3), str(encoding_id % 13)}) for encoding_id in range(1000)}).encode()

mc, upload_info = get_temp_upload_client(project, requests, project['update_tokens'][0])

Expand Down Expand Up @@ -203,8 +203,8 @@ def test_project_upload_external_data(requests, a_blocking_project, binary_test_
}
)
assert res3.status_code == 201
run_id = post_run(requests, project, threshold=0.9)
result = get_run_result(requests, project, run_id, timeout=60)
run_id = post_run(requests, project, threshold=0.95)
result = get_run_result(requests, project, run_id, timeout=120)
assert 'groups' in result


Expand Down