Create a real ServableStateMonitor in tensorflow_model_server (this i…

…s a must as the monitor is now used to determine model availability in server_core). Change: 131982745
pythonner · Sep 8, 2016 · b568ac3 · b568ac3
1 parent 7f09e22
commit b568ac3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/tensorflow_serving/model_servers/BUILD b/tensorflow_serving/model_servers/BUILD
@@ -93,6 +93,7 @@ cc_binary(
         "@org_tensorflow//tensorflow/core:lib",
         "@org_tensorflow//tensorflow/core/platform/cloud:gcs_file_system",
         "//tensorflow_serving/apis:prediction_service_proto",
+        "//tensorflow_serving/core:servable_state_monitor",
         "@grpc//:grpc++",
     ] + TENSORFLOW_DEPS + SUPPORTED_TENSORFLOW_OPS,
 )

diff --git a/tensorflow_serving/model_servers/main.cc b/tensorflow_serving/model_servers/main.cc
@@ -57,6 +57,7 @@ limitations under the License.
 #include "tensorflow_serving/apis/prediction_service.grpc.pb.h"
 #include "tensorflow_serving/apis/prediction_service.pb.h"
 #include "tensorflow_serving/config/model_server_config.pb.h"
+#include "tensorflow_serving/core/servable_state_monitor.h"
 #include "tensorflow_serving/model_servers/server_core.h"
 #include "tensorflow_serving/servables/tensorflow/predict_impl.h"
 #include "tensorflow_serving/servables/tensorflow/session_bundle_source_adapter.h"
@@ -104,7 +105,7 @@ tensorflow::Status CreateSourceAdapter(
 tensorflow::Status CreateServableStateMonitor(
     EventBus<ServableState>* event_bus,
     std::unique_ptr<ServableStateMonitor>* monitor) {
-  *monitor = nullptr;
+  monitor->reset(new ServableStateMonitor(event_bus));
   return tensorflow::Status::OK();
 }