Skip to content

Unable to submit a merge PR.

Summary

I just upgraded my chart from 4.6.3 to 4.7.4(4.6.3->4.6.5->4.7.4). And when I click Submit merge request, 500 internal.

Steps to reproduce

Create a new merge PR, click Submit merge request.

Configuration used

global:
  hosts:
    domain: happyzh.com
    hostSuffix: git
    https: true
    #externalIP: "10.0.2.80"
    externalIP: "192.168.0.188"
    gitlab:
      name: git.happyzh.com
      https: true
    registry:
      name: registry.happyzh.com
      https: true
    minio:
      name: minio.happyzh.com
      https: true
  shell:
    port: &shell_port 10022
  ingress:
    configureCertmanager: false
  smtp:
    enabled: true
    address: "smtp.exmail.qq.com"
    port: 465
    user_name: &email_username "git_notify@mail.happyzh.com"
    password:
      secret: "zh-gitlab-smtp-password"
      key: password
    domain: "mail.happyzh.com"
    authentication: plain
    starttls_auto: true
    tls: true
    openssl_verify_mode: peer
  email:
    from: *email_username
    display_name: "HappyZH GitLab"
    reply_to: *email_username
    subject_suffix: ""
  psql:
    host: "10.0.2.41"
    #host: "git-postgresql"
    port: 5432
    username: gitlab
    database: gitlabhq_production
    password:
      secret: zh-gitlab-external-psql-password
      key: password
  redis:
    host: "10.0.2.41"
    port: 6379
    password:
      secret: zh-gitlab-external-redis-password
      key: password



gitlab:
  # gitlab sub charts
  # gitlab.xxx in original configuration
  gitaly:
    persistence:
      enabled: true
      size: 20Gi
      accessModes: &accessModes
        - ReadWriteOnce
      storageClass: &storageClass "nfs"
      matchLabels:
        app: gitaly
        release: &release "zh-gitlab"
  webservice:
    ingress:
      enabled: true
      tls:
        enabled: true
        secretName: git.happyzh.com
  task-runner:
    backups:
      objectStorage:
        config:
          secret: zh-gitlab-s3-secret
          key: ".s3cfg"
  gitlab-shell:
    service:
      name: gitlab-shell
      type: ClusterIP
      externalPort: *shell_port
      internalPort: 2222
      # loadBalancerIP: x.x.x.x
      # loadBalancerSourceRanges:
      # - x.x.x.x/yy
      # externalIPs:
      # - x.x.x.x
      # - y.y.y.y

# charts
# root of original configuration
registry:
  enabled: true
  install: true
  ingress:
    enabled: true
    tls:
      enabled: true
      secretName: registry.happyzh.com

postgresql:
  install: false
#  persistence:
#    enabled: true
#    accessMode: ReadWriteOnce
#    storageClass: *storageClass
#    matchLabels:
#      app: postgresql
#      release: *release

minio:
  persistence:
    enabled: true
    accessModes: *accessModes
    storageClass: *storageClass
    matchLabels:
      app: minio
      release: *release
  ingress:
    enabled: true
    tls:
      enabled: true
      secretName: minio.happyzh.com

redis:
  install: false
  enable: false
#  persistence:
#    existingClaim: zh-gitlab-redis # necessary

prometheus:
  server:
    persistentVolume:
#      enabled: false
      accessModes: *accessModes
      storageClass: *storageClass
      matchLabels:
        app: prometheus
        release: *release
  rbac:
    create: true

certmanager-issuer:
  email: 475647575@qq.com

certmanager:
  install: false
  enable: false
  rbac:
    create: false

gitlab-runner:
  install: false
  enable: false
  rbac:
    create: false

Current behavior

500 Internal Error.

Expected behavior

200 Ok.

Versions

  • Chart: 4.7.4
  • Platform:
    • Self-hosted: MicroKube
  • Kubernetes: (kubectl version)
    • Client:
    • Server:
  • Helm: (helm version)
    • Client: Client Version: version.Info{Major:"1", Minor:"16", GitVersion:"v1.16.0", GitCommit:"2bd9643cee5b3b3a5ecbd3af49d09018f0773c77", GitTreeState:"clean", BuildDate:"2019-09-18T14:36:53Z", GoVersion:"go1.12.9", Compiler:"gc", Platform:"windows/amd64"}
    • Server: Server Version: version.Info{Major:"1", Minor:"20+", GitVersion:"v1.20.1-34+e7db93d188d0d1", GitCommit:"e7db93d188d0d12f2fe5336d1b85cdb94cb909d3", GitTreeState:"clean", BuildDate:"2021-01-11T23:50:46Z", GoVersion:"go1.15.6", Compiler:"gc", Platform:"linux/amd64"}

Relevant logs

WebService: 

*** /var/log/gitlab/production.log ***
Started POST "/weizehua/aaqt/-/merge_requests" for 10.1.68.26 at 2021-01-20 06:27:42 +0000
Processing by Projects::MergeRequests::CreationsController#create as HTML
  Parameters: {"utf8"=>"✓", "authenticity_token"=>"[FILTERED]", "merge_request"=>{"title"=>"[FILTERED]", "description"=>"[FILTERED]", "assignee_ids"=>["0"], "reviewer_ids"=>["0"], "label_ids"=>[""], "force_remove_source_branch"=>"0", "squash"=>"0", "lock_version"=>"0", "source_project_id"=>"43", "source_branch"=>"system_source", "target_project_id"=>"43", "target_branch"=>"dev"}, "merge_request_diff_head_sha"=>"f9b5c7420a9789733f8e33c89d4b769ccf13f197", "namespace_id"=>"weizehua", "project_id"=>"aaqt"}
Completed 500 Internal Server Error in 420ms (ActiveRecord: 18.0ms | Elasticsearch: 0.0ms | Allocations: 34386)

ActiveModel::UnknownAttributeError (unknown attribute 'sorted' for MergeRequestDiff.):

app/models/merge_request_diff.rb:695:in `save_diffs'
lib/gitlab/metrics/instrumentation.rb:160:in `block in save_diffs'
lib/gitlab/metrics/method_call.rb:27:in `measure'
lib/gitlab/metrics/instrumentation.rb:160:in `save_diffs'
app/models/merge_request_diff.rb:186:in `save_git_content'
lib/gitlab/metrics/instrumentation.rb:160:in `block in save_git_content'
lib/gitlab/metrics/method_call.rb:27:in `measure'
lib/gitlab/metrics/instrumentation.rb:160:in `save_git_content'
app/models/merge_request.rb:910:in `block in create_merge_request_diff'
lib/gitlab/gitaly_client.rb:302:in `allow_n_plus_1_calls'
app/models/merge_request.rb:909:in `create_merge_request_diff'
lib/gitlab/metrics/instrumentation.rb:160:in `block in create_merge_request_diff'
lib/gitlab/metrics/method_call.rb:27:in `measure'
lib/gitlab/metrics/instrumentation.rb:160:in `create_merge_request_diff'
app/models/merge_request.rb:902:in `ensure_merge_request_diff'
lib/gitlab/metrics/instrumentation.rb:160:in `block in ensure_merge_request_diff'
lib/gitlab/metrics/method_call.rb:27:in `measure'
lib/gitlab/metrics/instrumentation.rb:160:in `ensure_merge_request_diff'
app/services/issuable_base_service.rb:153:in `block in create'
app/services/issuable_base_service.rb:152:in `create'
app/services/merge_requests/base_service.rb:68:in `create'
lib/gitlab/metrics/instrumentation.rb:160:in `block in create'
lib/gitlab/metrics/method_call.rb:27:in `measure'
lib/gitlab/metrics/instrumentation.rb:160:in `create'
app/services/merge_requests/create_service.rb:33:in `create'
lib/gitlab/metrics/instrumentation.rb:160:in `block in create'
lib/gitlab/metrics/method_call.rb:27:in `measure'
lib/gitlab/metrics/instrumentation.rb:160:in `create'
app/services/merge_requests/create_service.rb:13:in `execute'
lib/gitlab/metrics/instrumentation.rb:160:in `block in execute'
lib/gitlab/metrics/method_call.rb:27:in `measure'
lib/gitlab/metrics/instrumentation.rb:160:in `execute'
app/controllers/projects/merge_requests/creations_controller.rb:25:in `create'
ee/lib/gitlab/ip_address_state.rb:10:in `with'
ee/app/controllers/ee/application_controller.rb:44:in `set_current_ip_address'
app/controllers/application_controller.rb:494:in `set_current_admin'
lib/gitlab/session.rb:11:in `with_session'
app/controllers/application_controller.rb:485:in `set_session_storage'
lib/gitlab/i18n.rb:73:in `with_locale'
lib/gitlab/i18n.rb:79:in `with_user_locale'
app/controllers/application_controller.rb:479:in `set_locale'
lib/gitlab/error_tracking.rb:52:in `with_context'
app/controllers/application_controller.rb:544:in `sentry_context'
app/controllers/application_controller.rb:472:in `block in set_current_context'
lib/gitlab/application_context.rb:54:in `block in use'
lib/gitlab/application_context.rb:54:in `use'
lib/gitlab/application_context.rb:21:in `with_context'
app/controllers/application_controller.rb:464:in `set_current_context'
lib/gitlab/metrics/elasticsearch_rack_middleware.rb:16:in `call'
lib/gitlab/middleware/rails_queue_duration.rb:33:in `call'
lib/gitlab/metrics/rack_middleware.rb:16:in `block in call'
lib/gitlab/metrics/transaction.rb:56:in `run'
lib/gitlab/metrics/rack_middleware.rb:16:in `call'
lib/gitlab/request_profiler/middleware.rb:17:in `call'
lib/gitlab/jira/middleware.rb:19:in `call'
lib/gitlab/middleware/go.rb:20:in `call'
lib/gitlab/etag_caching/middleware.rb:21:in `call'
lib/gitlab/middleware/multipart.rb:234:in `call'
lib/gitlab/middleware/read_only/controller.rb:50:in `call'
lib/gitlab/middleware/read_only.rb:18:in `call'
lib/gitlab/middleware/same_site_cookies.rb:27:in `call'
lib/gitlab/middleware/handle_malformed_strings.rb:21:in `call'
lib/gitlab/middleware/basic_health_check.rb:25:in `call'
lib/gitlab/middleware/handle_ip_spoof_attack_error.rb:25:in `call'
lib/gitlab/middleware/request_context.rb:23:in `call'
config/initializers/fix_local_cache_middleware.rb:9:in `call'
lib/gitlab/metrics/requests_rack_middleware.rb:76:in `call'
lib/gitlab/middleware/release_env.rb:12:in `call'
Started GET "/" for 10.1.68.26 at 2021-01-20 06:27:43 +0000
Processing by RootController#index as */*
Redirected to https://git.happyzh.com/users/sign_in
Filter chain halted as :redirect_unlogged_user rendered or redirected
Completed 302 Found in 4ms (ActiveRecord: 0.0ms | Elasticsearch: 0.0ms | Allocations: 2023)