[
https://issues.apache.org/jira/browse/BEAM-2732?focusedWorklogId=100247&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-100247
]
ASF GitHub Bot logged work on BEAM-2732:
----------------------------------------
Author: ASF GitHub Bot
Created on: 09/May/18 20:27
Start Date: 09/May/18 20:27
Worklog Time Spent: 10m
Work Description: pabloem closed pull request #5321: [BEAM-2732]
Improving Cython annotations for State Sampler
URL: https://github.com/apache/beam/pull/5321
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/sdks/python/apache_beam/runners/worker/opcounters.pxd
b/sdks/python/apache_beam/runners/worker/opcounters.pxd
index 0bcd42848d2..1d7f296c5ce 100644
--- a/sdks/python/apache_beam/runners/worker/opcounters.pxd
+++ b/sdks/python/apache_beam/runners/worker/opcounters.pxd
@@ -19,13 +19,14 @@ cimport cython
cimport libc.stdint
from apache_beam.utils.counters cimport Counter
+from apache_beam.runners.worker cimport statesampler_fast
cdef class TransformIOCounter(object):
cdef readonly object _counter_factory
cdef readonly object _state_sampler
cdef Counter bytes_read_counter
- cdef object scoped_state
+ cdef statesampler_fast.ScopedState scoped_state
cdef object _latest_step
cpdef update_current_step(self)
diff --git a/sdks/python/apache_beam/runners/worker/statesampler_fast.pxd
b/sdks/python/apache_beam/runners/worker/statesampler_fast.pxd
new file mode 100644
index 00000000000..a808a8e4a89
--- /dev/null
+++ b/sdks/python/apache_beam/runners/worker/statesampler_fast.pxd
@@ -0,0 +1,59 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+cimport cython
+
+from apache_beam.metrics.execution cimport MetricsContainer
+
+from cpython cimport pythread
+from libc.stdint cimport int32_t, int64_t
+
+cdef class StateSampler(object):
+ """Tracks time spent in states during pipeline execution."""
+ cdef int _sampling_period_ms
+
+ cdef list scoped_states_by_index
+
+ cdef public bint started
+ cdef public bint finished
+ cdef object sampling_thread
+
+ # This lock guards members that are shared between threads, specificaly
+ # finished, scoped_states_by_index, and the nsecs field of each state
therein.
+ cdef pythread.PyThread_type_lock lock
+
+ cdef public int64_t state_transition_count
+ cdef public int64_t time_since_transition
+
+ cdef int32_t current_state_index
+
+ cpdef _scoped_state(self, counter_name, output_counter, metrics_container)
+
+cdef class ScopedState(object):
+ """Context manager class managing transitions for a given sampler state."""
+
+ cdef readonly StateSampler sampler
+ cdef readonly int32_t state_index
+ cdef readonly object counter
+ cdef readonly object name
+ cdef readonly int64_t _nsecs
+ cdef int32_t old_state_index
+ cdef readonly MetricsContainer _metrics_container
+
+ cpdef __enter__(self)
+
+ cpdef __exit__(self, unused_exc_type, unused_exc_value, unused_traceback)
diff --git a/sdks/python/apache_beam/runners/worker/statesampler_fast.pyx
b/sdks/python/apache_beam/runners/worker/statesampler_fast.pyx
index 0fc58445f3b..21b09e626ec 100644
--- a/sdks/python/apache_beam/runners/worker/statesampler_fast.pyx
+++ b/sdks/python/apache_beam/runners/worker/statesampler_fast.pyx
@@ -70,23 +70,6 @@ cdef inline int64_t get_nsec_time() nogil:
cdef class StateSampler(object):
"""Tracks time spent in states during pipeline execution."""
- cdef int _sampling_period_ms
-
- cdef list scoped_states_by_index
-
- cdef public bint started
- cdef public bint finished
- cdef object sampling_thread
-
- # This lock guards members that are shared between threads, specificaly
- # finished, scoped_states_by_index, and the nsecs field of each state
therein.
- cdef pythread.PyThread_type_lock lock
-
- cdef public int64_t state_transition_count
- cdef public int64_t time_since_transition
-
- cdef int32_t current_state_index
-
def __init__(self, sampling_period_ms, *args):
self._sampling_period_ms = sampling_period_ms
self.started = False
@@ -157,7 +140,7 @@ cdef class StateSampler(object):
return self.scoped_states_by_index[self.current_state_index]
cpdef _scoped_state(self, counter_name, output_counter,
- metrics_container=None):
+ metrics_container):
"""Returns a context manager managing transitions for a given state.
Args:
counter_name: A CounterName object with information about the execution
@@ -186,14 +169,6 @@ cdef class StateSampler(object):
cdef class ScopedState(object):
"""Context manager class managing transitions for a given sampler state."""
- cdef readonly StateSampler sampler
- cdef readonly int32_t state_index
- cdef readonly object counter
- cdef readonly object name
- cdef readonly int64_t _nsecs
- cdef int32_t old_state_index
- cdef readonly MetricsContainer _metrics_container
-
def __init__(
self, sampler, name, state_index, counter=None, metrics_container=None):
self.sampler = sampler
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
Issue Time Tracking
-------------------
Worklog Id: (was: 100247)
Time Spent: 14h 40m (was: 14.5h)
> State tracking in Python is inefficient and has duplicated code
> ---------------------------------------------------------------
>
> Key: BEAM-2732
> URL: https://issues.apache.org/jira/browse/BEAM-2732
> Project: Beam
> Issue Type: Bug
> Components: sdk-py-core
> Reporter: Pablo Estrada
> Assignee: Pablo Estrada
> Priority: Major
> Time Spent: 14h 40m
> Remaining Estimate: 0h
>
> e.g logging and metrics keep state separately. State tracking should be
> unified.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
