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

Jump to bottom

Fix contention issue #1582

Merged
merged 6 commits into from
May 25, 2021
Merged

Fix contention issue #1582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f663e35
Disable indexing
woop May 24, 2021
319db88
Add option to set datastore write concurrency
woop May 24, 2021
46796fa
Add batch size configuration
woop May 24, 2021
7eb67d1
Ensure only positive integers
woop May 24, 2021
13dce6f
Fix lint
woop May 24, 2021
e6c63e1
Reorder code
woop May 24, 2021
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
16 changes: 11 additions & 5 deletions sdk/python/feast/infra/gcp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ def __init__(self, config: RepoConfig):
assert isinstance(config.online_store, DatastoreOnlineStoreConfig)
self._gcp_project_id = config.online_store.project_id
self._namespace = config.online_store.namespace
self._write_concurrency = config.online_store.write_concurrency
self._write_batch_size = config.online_store.write_batch_size
Comment on lines +45 to +46
Copy link
Collaborator

Choose a reason for hiding this comment

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

nit: move these up by 2 lines so that online store & offline store code are logically grouped

Copy link
Member Author

Choose a reason for hiding this comment

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

rebase gone wrong

Copy link
Member Author

Choose a reason for hiding this comment

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

done


assert config.offline_store is not None
self.offline_store = get_offline_store_from_config(config.offline_store)
Expand Down Expand Up @@ -72,7 +74,9 @@ def update_infra(

for table in tables_to_keep:
key = client.key("Project", project, "Table", table.name)
entity = datastore.Entity(key=key)
entity = datastore.Entity(
key=key, exclude_from_indexes=("created_ts", "event_ts", "values")
)
entity.update({"created_ts": datetime.utcnow()})
client.put(entity)

Expand Down Expand Up @@ -113,10 +117,10 @@ def online_write_batch(
) -> None:
client = self._initialize_client()

pool = ThreadPool(processes=40)
pool = ThreadPool(processes=self._write_concurrency)
pool.map(
lambda b: _write_minibatch(client, project, table, b, progress),
_to_minibatches(data),
_to_minibatches(data, batch_size=self._write_batch_size),
)

def online_read(
Expand Down Expand Up @@ -217,7 +221,7 @@ def get_historical_features(
]


def _to_minibatches(data: ProtoBatch, batch_size=50) -> Iterator[ProtoBatch]:
def _to_minibatches(data: ProtoBatch, batch_size) -> Iterator[ProtoBatch]:
"""
Split data into minibatches, making sure we stay under GCP datastore transaction size
limits.
Expand Down Expand Up @@ -247,7 +251,9 @@ def _write_minibatch(

key = client.key("Project", project, "Table", table.name, "Row", document_id,)

entity = datastore.Entity(key=key)
entity = datastore.Entity(
key=key, exclude_from_indexes=("created_ts", "event_ts", "values")
)

entity.update(
dict(
Expand Down
15 changes: 14 additions & 1 deletion sdk/python/feast/repo_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
from pathlib import Path

import yaml
from pydantic import BaseModel, StrictInt, StrictStr, ValidationError, root_validator
from pydantic import (
BaseModel,
PositiveInt,
StrictInt,
StrictStr,
ValidationError,
root_validator,
)
from pydantic.error_wrappers import ErrorWrapper
from pydantic.typing import Dict, Literal, Optional, Union

Expand Down Expand Up @@ -38,6 +45,12 @@ class DatastoreOnlineStoreConfig(FeastBaseModel):
namespace: Optional[StrictStr] = None
""" (optional) Datastore namespace """

write_concurrency: Optional[PositiveInt] = 40
""" (optional) Amount of threads to use when writing batches of feature rows into Datastore"""

write_batch_size: Optional[PositiveInt] = 50
""" (optional) Amount of feature rows per batch being written into Datastore"""


OnlineStoreConfig = Union[DatastoreOnlineStoreConfig, SqliteOnlineStoreConfig]

Expand Down