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.

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

mad/ldap类型目录进行停用目录操作,其定时同步任务仍在执行 #960

Closed
neronkl opened this issue Apr 12, 2023 · 6 comments
Assignees
Labels
Priority: Middlum Middlum priority Type: bug Something isn't working
Milestone

Comments

@neronkl
Copy link
Collaborator

neronkl commented Apr 12, 2023

用文字描述你遇到的问题

mad/ldap类型目录进行停用目录操作,其定时同步任务仍在执行

重现方法

新建一个ldap/mad目录,配置同步周期。停用目录,观察beat日志,

预期行为

mad/ldap类型目录进行停用目录操作后,同时无效化其定时同步任务
重新启用的时候,周期任务恢复

版本

  • 提供用户管理的具体版本号:
    2.5.2
  • 是否是企业版问题?

如果是 SaaS 页面问题,请提供使用的操作系统和浏览器信息

  • OS: [e.g. iOS]
  • Browser [e.g. chrome, safari]
  • Version [e.g. 22]

额外信息

任何你觉得有助于问题解决的内容

@nannan00 nannan00 added Type: bug Something isn't working Priority: Middlum Middlum priority todo 进入开发排期的状态,纳入了最近的迭代 labels Apr 13, 2023
@nannan00
Copy link
Collaborator

已确认是bug,对于停用和启用,需要进行周期任务的删除和添加

@neronkl
Copy link
Collaborator Author

neronkl commented Apr 13, 2023

目录进行停用/启用的状态变更,传入参数:activated。

  1. PeriodTask 有开关字段enabled, 由该字段决定定时同步任务的开启/关闭
  2. 根据activated, 决定定时同步任务的enabled字段

@Canway-shiisa
Copy link
Contributor

Canway-shiisa commented Apr 13, 2023

<目录删除>(https://github.com/TencentBlueKing/bk-user/issues/901) 的需求也涉及到定时同步任务的关停及启用问题,感觉这块在目录删除这里一并处理掉就可以?

  1. 任务暂停可以通过周期任务表PeriodTask 的enabled字段控制
  2. 任务删除的话 可以复用原来的任务删除逻辑 :
    def delete_periodic_sync_task(category_id: int):

    @nannan00

@neronkl
Copy link
Collaborator Author

neronkl commented Apr 13, 2023

<目录删除>(https://github.com/TencentBlueKing/bk-user/issues/901) 的需求也涉及到定时同步任务的关停及启用问题,感觉这块在目录删除这里一并处理掉就可以?

  1. 任务暂停可以通过周期任务表PeriodTask 的enabled字段控制

  2. 任务删除的话 可以复用原来的任务删除逻辑 :

    def delete_periodic_sync_task(category_id: int):

    @nannan00

定时任务的删除只是针对目录硬删除阶段

@Canway-shiisa Canway-shiisa modified the milestone: Y2023M16 Apr 17, 2023
@nannan00 nannan00 modified the milestones: Y2023M16, Y2023M17 Apr 24, 2023
@nannan00
Copy link
Collaborator

可以,从目前产品设计来看,目录停用后才可以进行目录的删除或还原,

所以目录停用后 定时任务enabled=False

如果重新启用,则enabled=True
如果软删除,即放到回收站,则不变,还是维持enabled=False

进一步:
如果在回收站里硬删除,则删除定时任务
如果还原,是直接还原到停用状态还是直接启用?如果是直接启用,则需要变更定时任务enabled=True

neronkl added a commit to neronkl/bk-user that referenced this issue Apr 25, 2023
@Xmandon Xmandon modified the milestones: Y2023M17, Y2023M19 May 8, 2023
@Canway-shiisa
Copy link
Contributor

Canway-shiisa commented May 15, 2023

在 <回收站-目录删除> 中就进行修复

@Canway-shiisa Canway-shiisa modified the milestones: Y2023M19, Y2023M20 May 15, 2023
@nannan00 nannan00 modified the milestones: Y2023M20, Y2023M21 May 22, 2023
@nannan00 nannan00 modified the milestones: Y2023M21, Y2023M22, Y2023M23 May 29, 2023
@nannan00 nannan00 modified the milestones: Y2023M23, Y2023M24 Jun 12, 2023
@nannan00 nannan00 modified the milestones: Y2023M24, Y2023M25 Jun 18, 2023
@nannan00 nannan00 modified the milestones: Y2023M25, Y2023M26 Jun 26, 2023
nannan00 pushed a commit that referenced this issue Jun 27, 2023
#962)

* feat(recycle_bin, categories, audit, period_task, login): 回收站目录项:新增删除,还原功能

回收站内删除等同对象硬删除(相关资源一并删除),还原为对象恢复正常状态,操作计入审计日志;阻止异常状态目录用户登录;

feat #901 #960
yuri0528 pushed a commit to yuri0528/bk-user that referenced this issue Jun 27, 2023
TencentBlueKing#962)

* feat(recycle_bin, categories, audit, period_task, login): 回收站目录项:新增删除,还原功能

回收站内删除等同对象硬删除(相关资源一并删除),还原为对象恢复正常状态,操作计入审计日志;阻止异常状态目录用户登录;

feat TencentBlueKing#901 TencentBlueKing#960
yuri0528 pushed a commit to yuri0528/bk-user that referenced this issue Jun 27, 2023
TencentBlueKing#962)

* feat(recycle_bin, categories, audit, period_task, login): 回收站目录项:新增删除,还原功能

回收站内删除等同对象硬删除(相关资源一并删除),还原为对象恢复正常状态,操作计入审计日志;阻止异常状态目录用户登录;

feat TencentBlueKing#901 TencentBlueKing#960
@nannan00 nannan00 closed this as completed Jul 3, 2023
@nannan00 nannan00 removed the todo 进入开发排期的状态,纳入了最近的迭代 label Jul 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Priority: Middlum Middlum priority Type: bug Something isn't working
Projects
None yet
Development

No branches or pull requests

4 participants