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

[QUERY] Robustness support of MQTT-hybrid #3510

Merged
merged 5 commits into from
Oct 9, 2021
Merged

[QUERY] Robustness support of MQTT-hybrid #3510

merged 5 commits into from
Oct 9, 2021

Conversation

gichan-jang
Copy link
Member

@gichan-jang gichan-jang commented Sep 30, 2021 •
edited

Releated issue: 3508
Robustness support of MQTT-hybrid.
If the connected server is stop, re-connect to another availabe server.

*Note: If nnsquery package is not found, tensor_query_* build and tests are skipped. I'll fix it later.
To build including this change, you need nnstreamer/nnstreamer-edge#2.

*TODO: MQTT-hybrid will be separated from tensor_query source.
After that, the tensor query will be built without nnsquery.

Test pipeline.
Server 1

gst-launch-1.0 tensor_query_serversrc operation=passthrough/optionalVal ! other/tensors,format=flexible ! tensor_query_serversink

Server 2

gst-launch-1.0 tensor_query_serversrc operation=passthrough/optional host=127.0.0.1 port=5001 ! other/tensors,format=flexible ! tensor_query_serversink host=127.0.0.1 port=5000

Client

gst-launch-1.0 v4l2src ! videoconvert ! videoscale ! video/x-raw,width=320,height=240,format=RGB,framerate=30/1 ! tensor_converter ! other/tensors,format=flexible ! tensor_query_client operation=passthrough ! tensor_converter input-dim=3:320:240 input-type=uint8 ! tensor_decoder mode=direct_video ! videoconvert ! ximagesink

Signed-off-by: Gichan Jang gichan2.jang@samsung.com

Self evaluation:

  1. Build test: [ ]Passed [ ]Failed [*]Skipped
  2. Run test: [ ]Passed [ ]Failed [*]Skipped

@taos-ci
Copy link
Collaborator

taos-ci commented Sep 30, 2021

📝 TAOS-CI Version: 1.5.20200925. Thank you for submitting PR #3510. Please a submit 1commit/1PR (one commit per one PR) policy to get comments quickly from reviewers. Your PR must pass all verificiation processes of cibot before starting a review process from reviewers. If you are new member to join this project, please read manuals in documentation folder and wiki page. In order to monitor a progress status of your PR in more detail, visit http://nnstreamer.mooo.com/.

@gichan-jang gichan-jang force-pushed the query/mqtt branch 2 times, most recently from 90cff62 to d6af6c9 Compare September 30, 2021 05:50
@taos-ci
Copy link
Collaborator

taos-ci commented Sep 30, 2021

:octocat: cibot: @gichan-jang, apptest could not be completed. To find out the reasons, please go to http://nnstreamer.mooo.com//nnstreamer/ci/repo-workers/pr-checker/3510-202109301450180.98032808303833-d6af6c945ca2ee9a2379a61095d8cbb75d013af9

@taos-ci
Copy link
Collaborator

taos-ci commented Sep 30, 2021

:octocat: cibot: @gichan-jang, A builder checker could not be completed because one of the checkers is not completed. In order to find out a reason, please go to http://nnstreamer.mooo.com/nnstreamer/ci/repo-workers/pr-checker/3510-202109301450180.98032808303833-d6af6c945ca2ee9a2379a61095d8cbb75d013af9/.

@taos-ci
Copy link
Collaborator

taos-ci commented Sep 30, 2021

:octocat: cibot: @gichan-jang, apptest could not be completed. To find out the reasons, please go to http://nnstreamer.mooo.com//nnstreamer/ci/repo-workers/pr-checker/3510-202109301606300.19975590705872-d87b1c5bfd91832d42b4e171df9ba800f445e2cb

@taos-ci
Copy link
Collaborator

taos-ci commented Sep 30, 2021

:octocat: cibot: @gichan-jang, A builder checker could not be completed because one of the checkers is not completed. In order to find out a reason, please go to http://nnstreamer.mooo.com/nnstreamer/ci/repo-workers/pr-checker/3510-202109301606300.19975590705872-d87b1c5bfd91832d42b4e171df9ba800f445e2cb/.

@taos-ci
Copy link
Collaborator

taos-ci commented Sep 30, 2021

:octocat: cibot: @gichan-jang, apptest could not be completed. To find out the reasons, please go to http://nnstreamer.mooo.com//nnstreamer/ci/repo-workers/pr-checker/3510-202109301700320.083643913269043-072b225a835ae8fc26d99961a5622da9cb8729b9

@taos-ci
Copy link
Collaborator

taos-ci commented Sep 30, 2021

:octocat: cibot: @gichan-jang, A builder checker could not be completed because one of the checkers is not completed. In order to find out a reason, please go to http://nnstreamer.mooo.com/nnstreamer/ci/repo-workers/pr-checker/3510-202109301700320.083643913269043-072b225a835ae8fc26d99961a5622da9cb8729b9/.

@gichan-jang gichan-jang force-pushed the query/mqtt branch 2 times, most recently from 407b19b to de012b2 Compare September 30, 2021 09:59
@taos-ci
Copy link
Collaborator

taos-ci commented Sep 30, 2021

:octocat: cibot: @gichan-jang, A builder checker could not be completed because one of the checkers is not completed. In order to find out a reason, please go to http://nnstreamer.mooo.com/nnstreamer/ci/repo-workers/pr-checker/3510-202109301859320.76599597930908-de012b20760252287090dd040871ff3da1a79524/.

@taos-ci
Copy link
Collaborator

taos-ci commented Oct 1, 2021

:octocat: cibot: @gichan-jang, A builder checker could not be completed because one of the checkers is not completed. In order to find out a reason, please go to http://nnstreamer.mooo.com/nnstreamer/ci/repo-workers/pr-checker/3510-202110011339030.83104705810547-26d40fc5b31db2d0d3d2feb6aedc1462479e9102/.

wooksong
wooksong reviewed Oct 1, 2021
View reviewed changes
gst/nnstreamer/registerer/nnstreamer.c
@@ -67,9 +67,11 @@
#include <tensor_transform/tensor_transform.h>
#include <tensor_if/gsttensorif.h>
#include <tensor_rate/gsttensorrate.h>
#if (ENABLE_NNS_QUERY == 1)
Copy link
Member

Choose a reason for hiding this comment

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

IMO, tensor_query/tensor_query_*.h can hide this line and the following #endif.

Copy link
Member Author

Choose a reason for hiding this comment

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

Oh.. Interesting.
But the mqtt-hybrid (using `nnsquery) code will be separated from tensor_query soon, so it will be reverted.

@taos-ci
Copy link
Collaborator

taos-ci commented Oct 5, 2021

:octocat: cibot: @gichan-jang, A builder checker could not be completed because one of the checkers is not completed. In order to find out a reason, please go to http://nnstreamer.mooo.com/nnstreamer/ci/repo-workers/pr-checker/3510-202110051331300.65169906616211-9ed78319e347aeb2c1506f107a59e67703ee06df/.

@gichan-jang
[QUERY] Robustness support of MQTT-hybrid
e9b2a79 
Releated issue: nnstreamer#3508
Robustness support of MQTT-hybrid.
If the connected server is stop, re-connect to another availabe server.

Signed-off-by: Gichan Jang <gichan2.jang@samsung.com>
@gichan-jang
[Query] Add meson option.
1e126f7 
Exclude tensor_query from nnstreamer plugins if nnsquery is not available.

Signed-off-by: gichan <gichan2.jang@samsung.com>
@gichan-jang
[Query] Add mqtt state change callback.
c0ace6e 
Add mqtt state change callback instead of uncertain sleep.

Signed-off-by: gichan <gichan2.jang@samsung.com>
Signed-off-by: Gichan Jang <gichan2.jang@samsung.com>
@gichan-jang
[TEST] Add MQTT-hybrid test
7977093 
Test robustness of the query pipeline.
Server 1 stops when it receivces 3 buffers and the client reconnects to server 2.

Signed-off-by: gichan <gichan2.jang@samsung.com>
Signed-off-by: Gichan Jang <gichan2.jang@samsung.com>
@gichan-jang
[Query][NEED REVERT] Exclude tensor query from android build.
448c418 
Exclude tensor query from android build until mqtt-hybrid is separated.
After the separation works, please revert this commit.

Signed-off-by: Gichan Jang <gichan2.jang@samsung.com>
taos-ci
taos-ci approved these changes Oct 6, 2021
View reviewed changes
Copy link
Collaborator

@taos-ci taos-ci left a comment

Choose a reason for hiding this comment

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

@gichan-jang, 💯 All CI checkers are successfully verified. Thanks.

jaeyun-jung
jaeyun-jung approved these changes Oct 6, 2021
View reviewed changes
Copy link
Collaborator

@jaeyun-jung jaeyun-jung left a comment

Choose a reason for hiding this comment

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

LGTM.
We should separate mqtt-hybrid feature and base connection of tensor-query later :)

anyj0527
anyj0527 approved these changes Oct 8, 2021
View reviewed changes
Copy link
Member

@anyj0527 anyj0527 left a comment

Choose a reason for hiding this comment

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

LGTM ✔

@myungjoo myungjoo merged commit 72ddd08 into nnstreamer:main Oct 9, 2021
@gichan-jang gichan-jang mentioned this pull request Oct 14, 2021
Closed
@gichan-jang gichan-jang deleted the query/mqtt branch October 28, 2021 09:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wooksong wooksong wooksong left review comments

@anyj0527 anyj0527 anyj0527 approved these changes

@jaeyun-jung jaeyun-jung jaeyun-jung approved these changes

@taos-ci taos-ci taos-ci approved these changes

@again4you again4you Awaiting requested review from again4you again4you is a code owner

@dongju-chae dongju-chae Awaiting requested review from dongju-chae

@helloahn helloahn Awaiting requested review from helloahn

@jijoongmoon jijoongmoon Awaiting requested review from jijoongmoon jijoongmoon is a code owner

@kimjh12 kimjh12 Awaiting requested review from kimjh12

@kparichay kparichay Awaiting requested review from kparichay

@leemgs leemgs Awaiting requested review from leemgs

@lhs8928 lhs8928 Awaiting requested review from lhs8928

@myungjoo myungjoo Awaiting requested review from myungjoo myungjoo is a code owner

@zhoonit zhoonit Awaiting requested review from zhoonit

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@gichan-jang @taos-ci @wooksong @anyj0527 @jaeyun-jung @myungjoo