Spark sentry, revisted #1400
Merged
Spark sentry, revisted #1400
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…makes the code a little more future proof with some anticpated BU improvements.
alastair
requested changes
Apr 26, 2021
listenbrainz_spark/ftp/download.py
Outdated
|
|
||
| mapping_file_name = self.get_latest_mapping(mapping) | ||
|
|
||
| t0 = time.monotonic() | ||
| current_app.logger.info('Downloading {} from FTP...'.format(mapping_file_name)) | ||
| logging.info('Downloading {} from FTP...'.format(mapping_file_name)) |
There was a problem hiding this comment.
log instances in this file haven't been changed from logging -> logger
listenbrainz_spark/ftp/download.py
Outdated
| @@ -145,9 +147,9 @@ def download_listens(self, directory, listens_dump_id=None, dump_type=FULL): | |||
| listens_file_name (str): name of downloaded listens dump. | |||
| dump_id (int): Unique indentifier of downloaded listens dump. | |||
| """ | |||
| ftp_cwd = current_app.config['FTP_LISTENS_DIR'] + 'fullexport/' | |||
| ftp_cwd = config.FTP_LISTENS_DIR + 'fullexport/' | |||
There was a problem hiding this comment.
should use os.path.join to prevent issues with forgetting to add a / in the config file
| current_app.logger.info('Some ratings are less than -1 \nMin rating: {}'.format(min_rating)) | ||
| logger.info('Some ratings are less than -1 \nMin rating: {}'.format(min_rating)) | ||
|
|
||
| return (max_rating > 1.0, min_rating < -1.0) |
There was a problem hiding this comment.
add to docstring the return type
| @@ -93,15 +91,15 @@ def push_to_result_queue(self, messages): | |||
| avg_size_of_message //= num_of_messages | |||
| except ZeroDivisionError: | |||
| avg_size_of_message = 0 | |||
| current_app.logger.warn("No messages calculated", exc_info=True) | |||
| logging.warn("No messages calculated", exc_info=True) | |||
There was a problem hiding this comment.
warn is deprecated, replace with warning
There was a problem hiding this comment.
this uses logging, replace with logger
| @@ -14,5 +14,7 @@ time ./run.sh /usr/local/spark/bin/spark-submit \ | |||
| --conf "spark.driver.memoryOverhead"=$DRIVER_MEMORY_OVERHEAD \ | |||
| --conf "spark.executor.memoryOverhead"=$EXECUTOR_MEMORY_OVERHEAD \ | |||
| --conf "spark.driver.maxResultSize"=$DRIVER_MAX_RESULT_SIZE \ | |||
| --conf "spark.python.use.daemon"=true \ | |||
| --conf "spark.python.daemon.module"=sentry_daemon \ | |||
There was a problem hiding this comment.
indentation in this file is all over the place, we can fix it up
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR replaces #1289 by adding an intermediate logging object that should make future BU improvements easier to implement. This PR also fixes merge conflicts.