From 0677d45bd889ef8fcfc5e59f94e7fc4d7d48790c Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Fri, 11 Sep 2020 17:03:05 +0200 Subject: [PATCH 1/3] Update ocis-accounts@master --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index cf48569d1..f128615e7 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/micro/micro/v2 v2.8.0 github.com/openzipkin/zipkin-go v0.2.2 github.com/owncloud/flaex v0.2.0 - github.com/owncloud/ocis-accounts v0.4.2-0.20200910185129-565d3babb2ac + github.com/owncloud/ocis-accounts v0.4.2-0.20200911145524-bf3fb9eb4be6 github.com/owncloud/ocis-glauth v0.5.1-0.20200909064150-0735ec933777 github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7 github.com/owncloud/ocis-graph-explorer v0.0.0-20200210111049-017eeb40dc0c diff --git a/go.sum b/go.sum index 739030ee6..88395f11a 100644 --- a/go.sum +++ b/go.sum @@ -1264,6 +1264,8 @@ github.com/owncloud/ocis-accounts v0.4.2-0.20200909192941-cea2720c3942 h1:glDo8a github.com/owncloud/ocis-accounts v0.4.2-0.20200909192941-cea2720c3942/go.mod h1:wNACZ+jUb1upH9Uy74+rmGW5ZF4Y3/PBRHDuEfxQrYc= github.com/owncloud/ocis-accounts v0.4.2-0.20200910185129-565d3babb2ac h1:tmb3gEQuhRp8NF0c/Ruj8soZ+SV1fkMVlsc4INd4TBA= github.com/owncloud/ocis-accounts v0.4.2-0.20200910185129-565d3babb2ac/go.mod h1:wNACZ+jUb1upH9Uy74+rmGW5ZF4Y3/PBRHDuEfxQrYc= +github.com/owncloud/ocis-accounts v0.4.2-0.20200911145524-bf3fb9eb4be6 h1:4e4u6uT4AVWuyCECFKJ89nVGu7mZWQ3YTGzi4gGfM3k= +github.com/owncloud/ocis-accounts v0.4.2-0.20200911145524-bf3fb9eb4be6/go.mod h1:wNACZ+jUb1upH9Uy74+rmGW5ZF4Y3/PBRHDuEfxQrYc= github.com/owncloud/ocis-glauth v0.5.1-0.20200731165959-1081de7c60f1 h1:YA7tS4VFSUmjeZBt4Wa+fSoreH1VJYCFlHvoRey3ngM= github.com/owncloud/ocis-glauth v0.5.1-0.20200731165959-1081de7c60f1/go.mod h1:lZkoEjBuEi0QZUlBG+XgVvWC4GzbWCTnmZQcIhC2kMg= github.com/owncloud/ocis-glauth v0.5.1-0.20200909064150-0735ec933777 h1:WqILokqgQ1M8Iau8o27zr4BV5IWgTzgLlNYGmIkOgJ4= From 7eaf65aa54ea4e849e3f05697214f8be3c2c2d61 Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Fri, 11 Sep 2020 19:23:38 +0200 Subject: [PATCH 2/3] Update ocis-accounts@master --- go.mod | 2 +- go.sum | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index f128615e7..b79753f4a 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/micro/micro/v2 v2.8.0 github.com/openzipkin/zipkin-go v0.2.2 github.com/owncloud/flaex v0.2.0 - github.com/owncloud/ocis-accounts v0.4.2-0.20200911145524-bf3fb9eb4be6 + github.com/owncloud/ocis-accounts v0.4.2-0.20200911161616-e55b8ae2f440 github.com/owncloud/ocis-glauth v0.5.1-0.20200909064150-0735ec933777 github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7 github.com/owncloud/ocis-graph-explorer v0.0.0-20200210111049-017eeb40dc0c diff --git a/go.sum b/go.sum index 88395f11a..470ac8f7b 100644 --- a/go.sum +++ b/go.sum @@ -676,6 +676,7 @@ github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRx github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d h1:3PaI8p3seN09VjbTYC/QWlUZdZ1qS1zGjy7LH2Wt07I= github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls= github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= @@ -1266,6 +1267,8 @@ github.com/owncloud/ocis-accounts v0.4.2-0.20200910185129-565d3babb2ac h1:tmb3gE github.com/owncloud/ocis-accounts v0.4.2-0.20200910185129-565d3babb2ac/go.mod h1:wNACZ+jUb1upH9Uy74+rmGW5ZF4Y3/PBRHDuEfxQrYc= github.com/owncloud/ocis-accounts v0.4.2-0.20200911145524-bf3fb9eb4be6 h1:4e4u6uT4AVWuyCECFKJ89nVGu7mZWQ3YTGzi4gGfM3k= github.com/owncloud/ocis-accounts v0.4.2-0.20200911145524-bf3fb9eb4be6/go.mod h1:wNACZ+jUb1upH9Uy74+rmGW5ZF4Y3/PBRHDuEfxQrYc= +github.com/owncloud/ocis-accounts v0.4.2-0.20200911161616-e55b8ae2f440 h1:NOt2IoHWGG+gRkNGmEfU/Y8GxWH256hF5KzS21srEto= +github.com/owncloud/ocis-accounts v0.4.2-0.20200911161616-e55b8ae2f440/go.mod h1:wNACZ+jUb1upH9Uy74+rmGW5ZF4Y3/PBRHDuEfxQrYc= github.com/owncloud/ocis-glauth v0.5.1-0.20200731165959-1081de7c60f1 h1:YA7tS4VFSUmjeZBt4Wa+fSoreH1VJYCFlHvoRey3ngM= github.com/owncloud/ocis-glauth v0.5.1-0.20200731165959-1081de7c60f1/go.mod h1:lZkoEjBuEi0QZUlBG+XgVvWC4GzbWCTnmZQcIhC2kMg= github.com/owncloud/ocis-glauth v0.5.1-0.20200909064150-0735ec933777 h1:WqILokqgQ1M8Iau8o27zr4BV5IWgTzgLlNYGmIkOgJ4= From 2540069c3a93ed6b075adcf097cf2850b7eac97d Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Fri, 11 Sep 2020 19:25:31 +0200 Subject: [PATCH 3/3] Add changelog --- changelog/unreleased/update-accounts-fix-index.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 changelog/unreleased/update-accounts-fix-index.md diff --git a/changelog/unreleased/update-accounts-fix-index.md b/changelog/unreleased/update-accounts-fix-index.md new file mode 100644 index 000000000..3b112b7b5 --- /dev/null +++ b/changelog/unreleased/update-accounts-fix-index.md @@ -0,0 +1,10 @@ +Bugfix: Cleanup separated indices in memory + +The accounts service was creating a bleve index instance in the service handler, thus creating separate in memory indices for the http and grpc servers. We moved the service handler creation out of the server creation so that the service handler, thus also the bleve index, is a shared instance of the servers. + +This fixes a bug that accounts created through the web ui were not able to sign in until a service restart. + +https://github.com/owncloud/product/issues/224 +https://github.com/owncloud/ocis-accounts/pull/117 +https://github.com/owncloud/ocis-accounts/pull/118 +https://github.com/owncloud/ocis/pull/555