Callforusersthatloggedin stable9.1 #27248

jvillafanez · 2017-02-24T13:17:18Z

Description

Backport of #26361 with some adjusments

Related Issue

Motivation and Context

How Has This Been Tested?

Not yet tested.

Screenshots (if appropriate):

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

My code follows the code style of this project.
My change requires a change to the documentation.
I have updated the documentation accordingly.
I have read the CONTRIBUTING document.
I have added tests to cover my changes.
All new and existing tests passed.

@PVince81 @DeepDiver1975

* introduce callForSeenUsers and countSeenUsers * add tests * oracle should support not null on clob * since 9.2.0 Conflicts: lib/private/Repair/MoveAvatarOutsideHome.php lib/private/User/Manager.php tests/lib/User/ManagerTest.php

mention-bot · 2017-02-24T13:17:19Z

@jvillafanez, thanks for your PR! By analyzing the history of the files in this pull request, we identified @VicDeo, @PVince81 and @nickvergessen to be potential reviewers.

jvillafanez · 2017-02-27T10:21:04Z

Trashbin:expire -> only deleted one file with just the admin account logged in, and 225 LDAP users available:

without patch:

root@99f35337e60d:/opt/owncloud# time sudo -u www-data ./occ trashbin:expire
  226 [============================]

real	0m4.399s
user	0m0.996s
sys	0m0.312s
root@99f35337e60d:/opt/owncloud# time sudo -u www-data ./occ trashbin:expire
  226 [============================]

real	0m3.670s
user	0m0.928s
sys	0m0.276s

with patch:

root@f7a40a896fc2:/opt/owncloud# time sudo -u www-data ./occ trashbin:expire
    1 [============================]

real	0m0.464s
user	0m0.248s
sys	0m0.172s
root@f7a40a896fc2:/opt/owncloud# time sudo -u www-data ./occ trashbin:expire
    1 [============================]

real	0m0.417s
user	0m0.252s
sys	0m0.140s

PVince81 · 2017-02-27T11:04:21Z

apps/files_trashbin/lib/BackgroundJob/ExpireTrash.php

-		});
+		if (is_callable(array($this->userManager, 'callForSeenUsers'))) {
+			$this->userManager->callForSeenUsers(function(IUser $user) {
+				$uid = $user->getUID();


put this in a separate inline function to avoid code duplication ?

the other alternative is to store the name of the method in a string:

$methodName = 'callForSeenUsers'; $this->userManager->$methodName(...);

PVince81 · 2017-02-27T11:04:31Z

apps/files_trashbin/lib/Command/ExpireTrash.php

-				$this->expireTrashForUser($user);
-			});
+			if (is_callable(array($this->userManager, 'callForSeenUsers'))) {
+				$this->userManager->callForSeenUsers(function(IUser $user) use ($p) {


jvillafanez · 2017-02-27T11:54:03Z

Version:expire (same as above)

without patch:

root@99f35337e60d:/opt/owncloud# time sudo -u www-data ./occ version:expire
  226 [============================]

real	0m3.834s
user	0m1.048s
sys	0m0.200s
root@99f35337e60d:/opt/owncloud# time sudo -u www-data ./occ version:expire
  226 [============================]

real	0m3.663s
user	0m0.984s
sys	0m0.264s

with patch:

root@f7a40a896fc2:/opt/owncloud# time sudo -u www-data ./occ version:expire
    1 [============================]

real	0m0.406s
user	0m0.252s
sys	0m0.132s
root@f7a40a896fc2:/opt/owncloud# time sudo -u www-data ./occ version:expire
    1 [============================]

real	0m0.419s
user	0m0.280s
sys	0m0.112s

jvillafanez · 2017-02-27T12:59:12Z

Expire versions background job:

without patch (3 seconds):

{"reqId":"9pEyyV1uBAbknmInpMvZ","remoteAddr":"82.159.139.58","app":"cron","message":"Started background job of class : OCA\\Files_Versions\\BackgroundJob\\ExpireVersions with arguments : ","level":0,"time":"2017-02-27T12:23:13+00:00","method":"GET","url":"\/cron.php","user":"--"}
{"reqId":"9pEyyV1uBAbknmInpMvZ","remoteAddr":"82.159.139.58","app":"cron","message":"Finished background job, the job took : 3 seconds, this job is an instance of class : OCA\\Files_Versions\\BackgroundJob\\ExpireVersionswith arguments : ","level":0,"time":"2017-02-27T12:23:16+00:00","method":"GET","url":"\/cron.php","user":"--"}

with patch (0 seconds):

{"reqId":"q96oCxDGUM\/4un4H51hh","remoteAddr":"82.159.139.58","app":"cron","message":"Started background job of class : OCA\\Files_Versions\\BackgroundJob\\ExpireVersions with arguments : ","level":0,"time":"2017-02-27T12:25:07+00:00","method":"GET","url":"\/cron.php","user":"--"}
{"reqId":"q96oCxDGUM\/4un4H51hh","remoteAddr":"82.159.139.58","app":"cron","message":"Finished background job, the job took : 0 seconds, this job is an instance of class : OCA\\Files_Versions\\BackgroundJob\\ExpireVersionswith arguments : ","level":0,"time":"2017-02-27T12:25:07+00:00","method":"GET","url":"\/cron.php","user":"--"}

jvillafanez · 2017-02-27T13:03:05Z

Expire trashbin background job:

without patch (3 seconds):

{"reqId":"TuTI+FdM81ex6PN7fq\/O","remoteAddr":"82.159.139.58","app":"cron","message":"Started background job of class : OCA\\Files_Trashbin\\BackgroundJob\\ExpireTrash with arguments : ","level":0,"time":"2017-02-27T12:59:30+00:00","method":"GET","url":"\/cron.php","user":"--"}
{"reqId":"TuTI+FdM81ex6PN7fq\/O","remoteAddr":"82.159.139.58","app":"cron","message":"Finished background job, the job took : 3 seconds, this job is an instance of class : OCA\\Files_Trashbin\\BackgroundJob\\ExpireTrashwith arguments : ","level":0,"time":"2017-02-27T12:59:33+00:00","method":"GET","url":"\/cron.php","user":"--"}

with patch (0 seconds):

{"reqId":"1dFvCu6ehXqCz+dEXT9b","remoteAddr":"82.159.139.58","app":"cron","message":"Started background job of class : OCA\\Files_Trashbin\\BackgroundJob\\ExpireTrash with arguments : ","level":0,"time":"2017-02-27T13:00:11+00:00","method":"GET","url":"\/cron.php","user":"--"}
{"reqId":"1dFvCu6ehXqCz+dEXT9b","remoteAddr":"82.159.139.58","app":"cron","message":"Finished background job, the job took : 0 seconds, this job is an instance of class : OCA\\Files_Trashbin\\BackgroundJob\\ExpireTrashwith arguments : ","level":0,"time":"2017-02-27T13:00:11+00:00","method":"GET","url":"\/cron.php","user":"--"}

jvillafanez · 2017-02-27T13:11:01Z

I think this is ready.

PVince81

Almost there, adjust @since

PVince81 · 2017-02-27T15:08:03Z

lib/private/User/Manager.php

+	/**
+	 * returns how many users have logged in once
+	 *
+	 * @return int


@since 9.1 here and below

PVince81 · 2017-03-01T17:14:42Z

👍

Jenkins tests passed but unpublished

lock · 2019-08-03T20:02:17Z

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

butonic and others added 2 commits February 24, 2017 13:19

introduce callForSeenUsers and countSeenUsers (#26361)

4620940

* introduce callForSeenUsers and countSeenUsers * add tests * oracle should support not null on clob * since 9.2.0 Conflicts: lib/private/Repair/MoveAvatarOutsideHome.php lib/private/User/Manager.php tests/lib/User/ManagerTest.php

Adjust backport to work with stable9.1

8a718e2

jvillafanez added the 2 - Developing label Feb 24, 2017

jvillafanez added this to the 9.1.5 milestone Feb 24, 2017

Adjust tests

32486c3

PVince81 reviewed Feb 27, 2017

View reviewed changes

Refactor callback to avoid duplication

efc1111

jvillafanez added 3 - To Review and removed 2 - Developing labels Feb 27, 2017

PVince81 reviewed Feb 27, 2017

View reviewed changes

lib/private/User/Manager.php

/**

* returns how many users have logged in once

*

* @return int

Copy link

Contributor

PVince81 Feb 27, 2017

Choose a reason for hiding this comment

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

@since 9.1 here and below

PVince81 mentioned this pull request Feb 27, 2017

introduce callForSeenUsers and countSeenUsers #26361

Merged

adjust "@SInCE" tag

6dab0c3

PVince81 merged commit 59bd7f4 into stable9.1 Mar 1, 2017

PVince81 deleted the callforusersthatloggedin-stable9.1 branch March 1, 2017 17:14

VicDeo mentioned this pull request Mar 14, 2017

Upgrade 9.0.3.2 -> 9.1.1.3 (CentOS) - DiscoverManager not found #26297

Closed

lock bot locked as resolved and limited conversation to collaborators Aug 3, 2019

Callforusersthatloggedin stable9.1 #27248

Callforusersthatloggedin stable9.1 #27248

Conversation

jvillafanez commented Feb 24, 2017

Description

Related Issue

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

Checklist:

Uh oh!

mention-bot commented Feb 24, 2017

Uh oh!

jvillafanez commented Feb 27, 2017

Uh oh!

PVince81 Feb 27, 2017

Choose a reason for hiding this comment

Uh oh!

PVince81 Feb 27, 2017

Choose a reason for hiding this comment

Uh oh!

PVince81 Feb 27, 2017

Choose a reason for hiding this comment

Uh oh!

jvillafanez commented Feb 27, 2017

Uh oh!

jvillafanez commented Feb 27, 2017

Uh oh!

jvillafanez commented Feb 27, 2017

Uh oh!

jvillafanez commented Feb 27, 2017

Uh oh!

PVince81 left a comment

Choose a reason for hiding this comment

Uh oh!

PVince81 Feb 27, 2017

Choose a reason for hiding this comment

Uh oh!

PVince81 commented Mar 1, 2017

Uh oh!

lock bot commented Aug 3, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants