Skip to content

Commit

Permalink
Issue #SB-28066 merge: Merge pull request #1670 from Jayaprakash8887/…
Browse files Browse the repository at this point in the history
…release-4.7.0

Issue #SB-28066 feat: reverting Content Auto-creator Flink Job for 4.7
  • Loading branch information
AmiableAnil authored Mar 1, 2022
2 parents 5bc4c22 + 7cdc698 commit c3629f9
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 79 deletions.
13 changes: 0 additions & 13 deletions kubernetes/ansible/roles/flink-jobs-deploy/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -195,13 +195,6 @@ flink_job_names:
taskmanager_memory: 1024m
taskslots: 1
cpu_requests: 0.3
content-auto-creator:
job_class_name: 'org.sunbird.job.contentautocreator.task.ContentAutoCreatorStreamTask'
replica: 1
jobmanager_memory: 1024m
taskmanager_memory: 1024m
taskslots: 1
cpu_requests: 0.3
audit-event-generator:
job_class_name: 'org.sunbird.job.auditevent.task.AuditEventGeneratorStreamTask'
replica: 1
Expand Down Expand Up @@ -276,12 +269,6 @@ audit_history_indexer_parallelism: 1
auto_creator_v2_consumer_parallelism: 1
auto_creator_v2_parallelism: 1


### Content Auto Creator Related Vars
content_auto_creator_consumer_parallelism: 1
content_auto_creator_parallelism: 1
auto_creator_g_service_acct_cred: "{{ auto_creator_gservice_acct_cred | default('') }}"

### MVC Indexer Related Vars
mvc_indexer_consumer_parallelism: 1
mvc_indexer_parallelism: 1
Expand Down
66 changes: 0 additions & 66 deletions kubernetes/helm_charts/datapipeline_jobs/values.j2
Original file line number Diff line number Diff line change
Expand Up @@ -528,72 +528,6 @@ auto-creator-v2:
taskmanager.memory.network.fraction: 0.1


content-auto-creator:
content-auto-creator: |+
include file("/data/flink/conf/base-config.conf")
kafka {
input.topic = "{{ env_name }}.auto.creation.job.request"
groupId = "{{ env_name }}-content-auto-creator-group"
failed.topic = "{{ env_name }}.auto.creation.job.request.failed"
}

task {
consumer.parallelism = {{ content_auto_creator_consumer_parallelism }}
parallelism = {{ content_auto_creator_parallelism }}
window.time = 60
}

redis {
database {
relationCache.id = 10
collectionCache.id = 5
}
}

service {
content_service.basePath = "{{ kp_content_service_base_url }}"
search.basePath = "{{ kp_search_service_base_url }}"
lms.basePath = "{{ lms_service_base_url }}"
learning_service.basePath = "{{ kp_learning_service_base_url }}"
}

cloud_storage_type="{{ cloud_store }}"
azure_storage_key="{{ sunbird_public_storage_account_name }}"
azure_storage_secret="{{ sunbird_public_storage_account_key }}"
azure_storage_container="{{ azure_public_container }}"

content_auto_creator {
actions=auto-create
allowed_object_types=["Content"]
allowed_content_stages=["create","upload","review","publish"]
content_mandatory_fields=["name","code","mimeType","primaryCategory","artifactUrl","lastPublishedBy"]
content_props_to_removed=["identifier","downloadUrl","variants","createdOn","collections","children","lastUpdatedOn","SYS_INTERNAL_LAST_UPDATED_ON","versionKey","s3Key","status","pkgVersion","toc_url","mimeTypesCount","contentTypesCount","leafNodesCount","childNodes","prevState","lastPublishedOn","flagReasons","compatibilityLevel","size","publishChecklist","publishComment","lastPublishedBy","rejectReasons","rejectComment","badgeAssertions","leafNodes","sYS_INTERNAL_LAST_UPDATED_ON","previewUrl","channel","objectType","visibility","version","pragma","prevStatus","streamingUrl","idealScreenSize","contentDisposition","lastStatusChangedOn","idealScreenDensity","lastSubmittedOn","publishError","flaggedBy","flags","lastFlaggedOn","publisher","lastUpdatedBy","lastSubmittedBy","uploadError","lockKey","publish_type","reviewError","totalCompressedSize","origin","originData","importError","questions"]
bulk_upload_mime_types=["video/mp4"]
artifact_upload_max_size=52428800
content_create_props=["name","code","mimeType","contentType","framework","processId","primaryCategory"]
artifact_upload_allowed_source=[]
g_service_acct_cred="{{ auto_creator_g_service_acct_cred }}"
gdrive.application_name=drive-download
initial_backoff_delay=120000
maximum_backoff_delay=1200000
increment_backoff_delay=2
api_call_delay=1
maxIteration=1
}

search_exists_fields=["originData"]
search_fields=["identifier","mimeType","pkgVersion","channel","status","origin","originData","artifactUrl"]


flink-conf: |+
jobmanager.memory.flink.size: {{ flink_job_names['content-auto-creator'].jobmanager_memory }}
taskmanager.memory.flink.size: {{ flink_job_names['content-auto-creator'].taskmanager_memory }}
taskmanager.numberOfTaskSlots: {{ flink_job_names['content-auto-creator'].taskslots }}
parallelism.default: 1
jobmanager.execution.failover-strategy: region
taskmanager.memory.network.fraction: 0.1


audit-event-generator:
audit-event-generator: |+
include file("/data/flink/conf/base-config.conf")
Expand Down

0 comments on commit c3629f9

Please sign in to comment.